diff --git a/config/example.globalbuild.properties b/config/example.globalbuild.properties deleted file mode 100644 index d3ca3158c..000000000 --- a/config/example.globalbuild.properties +++ /dev/null @@ -1,49 +0,0 @@ -# these are ant build properties that all of the vitro and build.xml files might need. -# -# All of these paths must be absolute or relative to the vitro directory. Relative -# is preferred. - -# Notice that the use of relative paths is facilitated by the basedir attribute of the -# ant project elements. All projects should use the same base directory so that the -# relative paths will point to the correct files. -# See the ant documentation for project element basedir attribute. - -############## basic configuration ############### -java_api=/usr/local/java/java_home - -############ tomcat stuff #################### -tomcat.home=/usr/local/tomcat - -############# source directory ######################################### -##### This parameter is used for referencing a "permanent" home ####### -##### in the source directory of the project for uploaded files ####### -##### so that if the Tomcat webapp context is wiped out, any ####### -##### uploaded files (usually images) are not lost. ####### -######################################################################## -source.home=/usr/local/src/Vitro - -######################################################################## -##### Everything under this is used by the Vitro build.xml files ####### -##### You should not need to customize it for you local install ####### -######################################################################## - -########### ant contrib tasks ############### -ant.lib=./config/ant/lib -ant.contrib.jar=${ant.lib}/ant-contrib-1.0b2.jar - -#### locations of files in the build ##### -webapp.dir=./webapp -webapp.lib=${webapp.dir}/lib -webapp.build=${webapp.dir}/.build -webapp.dir.jar=${webapp.build}/vitro-webapp.jar -webapp.name=vitro -webapp.deploy.home=${tomcat.home}/webapps/${webapp.name} - -ingest.dir=./ingestTool -ingest.lib=${ingest.dir}/lib -ingest.build=${ingest.dir}/build - -ws.dir=./services -ws.lib=${ws.dir}/lib -ws.build=${webapp.dir}/build -ws.wsdd.dir=${ws.dir}/wsdd diff --git a/config/test b/config/test deleted file mode 100644 index a6b65f3ad..000000000 --- a/config/test +++ /dev/null @@ -1,4 +0,0 @@ - -osk -sk -dklsjf diff --git a/utilities/buildutils/lib/ant.jar b/utilities/buildutils/lib/ant.jar new file mode 100644 index 000000000..704717779 Binary files /dev/null and b/utilities/buildutils/lib/ant.jar differ diff --git a/utilities/buildutils/lib/junit-4.8.1.jar b/utilities/buildutils/lib/junit-4.8.1.jar new file mode 100644 index 000000000..524cd65ce Binary files /dev/null and b/utilities/buildutils/lib/junit-4.8.1.jar differ diff --git a/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/anttasks/AbstractWrappedFileSet.java b/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/anttasks/AbstractWrappedFileSet.java new file mode 100644 index 000000000..c9913fd7a --- /dev/null +++ b/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/anttasks/AbstractWrappedFileSet.java @@ -0,0 +1,84 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.utilities.anttasks; + +import java.io.File; +import java.util.Iterator; +import java.util.List; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.PatternSet; +import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.types.ResourceCollection; +import org.apache.tools.ant.types.resources.FileResource; + +/** + * A base class for our custom-made FileSet extensions. + */ +public abstract class AbstractWrappedFileSet implements ResourceCollection { + private Project p; + + /** The list of FileResources that we will yield to the task. */ + protected List files; + + /** The internal FileSet */ + private FileSet fileSet = new FileSet(); + + public void setProject(Project p) { + this.p = p; + fileSet.setProject(p); + } + + public void setDir(File dir) { + fileSet.setDir(dir); + } + + public PatternSet.NameEntry createInclude() { + return fileSet.createInclude(); + } + + public PatternSet.NameEntry createExclude() { + return fileSet.createExclude(); + } + + public PatternSet createPatternSet() { + return fileSet.createPatternSet(); + } + + + @Override + public Object clone() { + throw new BuildException(this.getClass().getSimpleName() + + " does not support cloning."); + } + + @Override + public boolean isFilesystemOnly() { + return true; + } + + @Override + public Iterator iterator() { + fillFileList(); + return files.iterator(); + } + + @Override + public int size() { + fillFileList(); + return files.size(); + } + + protected abstract void fillFileList(); + + protected Project getProject() { + return p; + } + + protected FileSet getInternalFileSet() { + return fileSet; + } + +} diff --git a/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/anttasks/DirDifferenceFileSet.java b/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/anttasks/DirDifferenceFileSet.java new file mode 100644 index 000000000..72af590cd --- /dev/null +++ b/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/anttasks/DirDifferenceFileSet.java @@ -0,0 +1,59 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.utilities.anttasks; + +import java.io.File; +import java.util.ArrayList; +import java.util.Iterator; + +import org.apache.tools.ant.types.FileSet; +import org.apache.tools.ant.types.Path; +import org.apache.tools.ant.types.resources.FileResource; + +/** + * TODO + */ +public class DirDifferenceFileSet extends AbstractWrappedFileSet { + private Path blockingPath; + + public Path createBlockingPath() { + if (blockingPath == null) { + blockingPath = new Path(getProject()); + } + return blockingPath.createPath(); + } + + @Override + protected void fillFileList() { + if (files != null) { + return; + } + + FileSet fs = getInternalFileSet(); + + @SuppressWarnings("unchecked") + Iterator iter = fs.iterator(); + + files = new ArrayList(); + while (iter.hasNext()) { + FileResource fr = iter.next(); + if (!isBlocked(fr)) { + files.add(fr); + } + } + } + + /** + * Check to see whether this same file exists in any of the blocking + * directories. + */ + private boolean isBlocked(FileResource fr) { + for (String blockingDir : blockingPath.list()) { + File f = new File(blockingDir + File.separator + fr.getName()); + if (f.exists()) { + return true; + } + } + return false; + } +} diff --git a/utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/InfoResponseParser.java b/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/InfoResponseParser.java similarity index 100% rename from utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/InfoResponseParser.java rename to utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/InfoResponseParser.java diff --git a/utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/ProcessRunner.java b/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/ProcessRunner.java similarity index 100% rename from utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/ProcessRunner.java rename to utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/ProcessRunner.java diff --git a/utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java b/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java similarity index 100% rename from utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java rename to utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java diff --git a/webapp/test/edu/cornell/mannlib/vitro/testing/VitroTestRunListener.java b/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunListener.java similarity index 92% rename from webapp/test/edu/cornell/mannlib/vitro/testing/VitroTestRunListener.java rename to utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunListener.java index e818bb363..01245e92f 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/testing/VitroTestRunListener.java +++ b/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunListener.java @@ -1,26 +1,25 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.testing; +package edu.cornell.mannlib.vitro.utilities.testing; -import static edu.cornell.mannlib.vitro.testing.VitroTestRunner.ReportLevel.BRIEF; -import static edu.cornell.mannlib.vitro.testing.VitroTestRunner.ReportLevel.FULL; -import static edu.cornell.mannlib.vitro.testing.VitroTestRunner.ReportLevel.MORE; - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -import org.junit.runner.Description; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.junit.runner.notification.RunListener; - -import com.ibm.icu.text.SimpleDateFormat; - -import edu.cornell.mannlib.vitro.testing.VitroTestRunner.ReportLevel; +import static edu.cornell.mannlib.vitro.utilities.testing.VitroTestRunner.ReportLevel.BRIEF; +import static edu.cornell.mannlib.vitro.utilities.testing.VitroTestRunner.ReportLevel.FULL; +import static edu.cornell.mannlib.vitro.utilities.testing.VitroTestRunner.ReportLevel.MORE; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +import org.junit.runner.Description; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.junit.runner.notification.RunListener; + +import edu.cornell.mannlib.vitro.utilities.testing.VitroTestRunner.ReportLevel; /** * Listen to events as they come from the JUnit test runner. The events from the diff --git a/webapp/test/edu/cornell/mannlib/vitro/testing/VitroTestRunner.java b/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunner.java similarity index 95% rename from webapp/test/edu/cornell/mannlib/vitro/testing/VitroTestRunner.java rename to utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunner.java index f30e086ae..76664d4e3 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/testing/VitroTestRunner.java +++ b/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunner.java @@ -1,14 +1,14 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.testing; +package edu.cornell.mannlib.vitro.utilities.testing; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.junit.runner.JUnitCore; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; + +import org.junit.runner.JUnitCore; /** * A Java application that will run the Vitro unit tests. It searches for unit diff --git a/webapp/build.xml b/webapp/build.xml index 0ec441147..36ce04617 100644 --- a/webapp/build.xml +++ b/webapp/build.xml @@ -13,18 +13,26 @@ + + + + + - + + + + + - - - - + + + + - - - + + @@ -32,28 +40,30 @@ paths: for compiling and running - - - - - - - - - - - - - - - - - --> - - - - - - + + + + + + + + + + - + - - - - + + + - @@ -77,12 +87,6 @@ deploy - Deploy the application directly into the Tomcat webapps directory. target: properties - - - - - - - - - - - - - - - - - --> - - - @@ -117,8 +121,8 @@ deploy - Deploy the application directly into the Tomcat webapps directory. - - + + - + + + + + + + + + + + - + - - - + + + - + - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + @@ -180,40 +192,17 @@ deploy - Deploy the application directly into the Tomcat webapps directory. - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + - - - - - + + + + + + @@ -271,54 +267,32 @@ deploy - Deploy the application directly into the Tomcat webapps directory. depends="test" unless="skipinfo" description="--> Store revision info in build"> - - - - - ${revisionInfo.timestamp} - - - - - - - - - + - + - + - + - - - + + + @@ -327,12 +301,12 @@ deploy - Deploy the application directly into the Tomcat webapps directory. - + - + @@ -347,7 +321,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory. - - - - - - - - - - - - - - - - - --> - + @@ -384,16 +358,48 @@ deploy - Deploy the application directly into the Tomcat webapps directory. ================================= --> - - - - - - - - - + location="${corebase.dir}/config/licenser/licenser.properties" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/config/licenser/known_exceptions.txt b/webapp/config/licenser/known_exceptions.txt index f13bae481..db0c787c2 100644 --- a/webapp/config/licenser/known_exceptions.txt +++ b/webapp/config/licenser/known_exceptions.txt @@ -113,21 +113,21 @@ webapp/web/src/xml/* webapp/web/templates/freemarker/page/partials/googleAnalytics.ftl # See /doc/3rd-party-licenses.txt for LICENSE file -webapp/config/tlds/sparqltag.tld +webapp/web/WEB-INF/tlds/sparqltag.tld # See /doc/3rd-party-licenses.txt for LICENSE file -webapp/config/tlds/c.tld -webapp/config/tlds/fn.tld +webapp/web/WEB-INF/tlds/c.tld +webapp/web/WEB-INF/tlds/fn.tld # PROBLEM: Can't find any info on licensing. -webapp/config/tlds/database.tld +webapp/web/WEB-INF/tlds/database.tld # See /doc/3rd-party-licenses.txt for LICENSE file -webapp/config/tlds/taglibs-mailer.tld +webapp/web/WEB-INF/tlds/taglibs-mailer.tld # See /doc/3rd-party-licenses.txt for LICENSE file -webapp/config/tlds/taglibs-random.tld -webapp/config/tlds/taglibs-string.tld +webapp/web/WEB-INF/tlds/taglibs-random.tld +webapp/web/WEB-INF/tlds/taglibs-string.tld # See /doc/3rd-party-licenses.txt for LICENSE file webapp/web/themes/enhanced/css/blueprint/grid.css diff --git a/webapp/product-build.xml b/webapp/product-build.xml deleted file mode 100644 index 3a3970123..000000000 --- a/webapp/product-build.xml +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - - - - - - - - This script should not be run by itself. - It should be invoked from the build script of a Vivo product. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webapp/web/themes/vitro/css/ie6.css b/webapp/themes/vitro/css/ie6.css similarity index 100% rename from webapp/web/themes/vitro/css/ie6.css rename to webapp/themes/vitro/css/ie6.css diff --git a/webapp/web/themes/vitro/css/ie7.css b/webapp/themes/vitro/css/ie7.css similarity index 100% rename from webapp/web/themes/vitro/css/ie7.css rename to webapp/themes/vitro/css/ie7.css diff --git a/webapp/web/themes/vitro/css/reset.css b/webapp/themes/vitro/css/reset.css similarity index 100% rename from webapp/web/themes/vitro/css/reset.css rename to webapp/themes/vitro/css/reset.css diff --git a/webapp/web/themes/vitro/css/screen.css b/webapp/themes/vitro/css/screen.css similarity index 100% rename from webapp/web/themes/vitro/css/screen.css rename to webapp/themes/vitro/css/screen.css diff --git a/webapp/web/themes/vitro/css/vitroTheme.css b/webapp/themes/vitro/css/vitroTheme.css similarity index 99% rename from webapp/web/themes/vitro/css/vitroTheme.css rename to webapp/themes/vitro/css/vitroTheme.css index 1aa609a2c..56999db45 100644 --- a/webapp/web/themes/vitro/css/vitroTheme.css +++ b/webapp/themes/vitro/css/vitroTheme.css @@ -1381,15 +1381,11 @@ a { .middle { vertical-align: middle; } - /* EDITING DISPLAY------> */ .edit-individual { border-left: 1px dotted #47b6d0; } -.disabledSubmit { - color: #ede ! important; - background-color: #47b6d0 ! important; -} + /* -------------------------------------------------> */ /* SITE ADMIN DASHBOARD ----------------------------> */ /* -------------------------------------------------> */ diff --git a/webapp/web/themes/vitro/images/VITRO-logo.png b/webapp/themes/vitro/images/VITRO-logo.png similarity index 100% rename from webapp/web/themes/vitro/images/VITRO-logo.png rename to webapp/themes/vitro/images/VITRO-logo.png diff --git a/webapp/web/themes/vitro/images/alert-overlay.png b/webapp/themes/vitro/images/alert-overlay.png similarity index 100% rename from webapp/web/themes/vitro/images/alert-overlay.png rename to webapp/themes/vitro/images/alert-overlay.png diff --git a/webapp/web/themes/vitro/images/arrow-grey.gif b/webapp/themes/vitro/images/arrow-grey.gif similarity index 100% rename from webapp/web/themes/vitro/images/arrow-grey.gif rename to webapp/themes/vitro/images/arrow-grey.gif diff --git a/webapp/web/themes/vitro/images/bullet.gif b/webapp/themes/vitro/images/bullet.gif similarity index 100% rename from webapp/web/themes/vitro/images/bullet.gif rename to webapp/themes/vitro/images/bullet.gif diff --git a/webapp/web/themes/vitro/images/header-background.gif b/webapp/themes/vitro/images/header-background.gif similarity index 100% rename from webapp/web/themes/vitro/images/header-background.gif rename to webapp/themes/vitro/images/header-background.gif diff --git a/webapp/web/themes/vitro/images/intro.gif b/webapp/themes/vitro/images/intro.gif similarity index 100% rename from webapp/web/themes/vitro/images/intro.gif rename to webapp/themes/vitro/images/intro.gif diff --git a/webapp/web/themes/vitro/images/jump-tp-property-group-menu.gif b/webapp/themes/vitro/images/jump-tp-property-group-menu.gif similarity index 100% rename from webapp/web/themes/vitro/images/jump-tp-property-group-menu.gif rename to webapp/themes/vitro/images/jump-tp-property-group-menu.gif diff --git a/webapp/web/themes/vitro/images/pointToCropPreview.jpg b/webapp/themes/vitro/images/pointToCropPreview.jpg similarity index 100% rename from webapp/web/themes/vitro/images/pointToCropPreview.jpg rename to webapp/themes/vitro/images/pointToCropPreview.jpg diff --git a/webapp/web/themes/vitro/images/rollover-nav.gif b/webapp/themes/vitro/images/rollover-nav.gif similarity index 100% rename from webapp/web/themes/vitro/images/rollover-nav.gif rename to webapp/themes/vitro/images/rollover-nav.gif diff --git a/webapp/web/themes/vitro/images/search-interior-pages.gif b/webapp/themes/vitro/images/search-interior-pages.gif similarity index 100% rename from webapp/web/themes/vitro/images/search-interior-pages.gif rename to webapp/themes/vitro/images/search-interior-pages.gif diff --git a/webapp/web/themes/vitro/images/search-interior-pages.png b/webapp/themes/vitro/images/search-interior-pages.png similarity index 100% rename from webapp/web/themes/vitro/images/search-interior-pages.png rename to webapp/themes/vitro/images/search-interior-pages.png diff --git a/webapp/web/themes/vitro/images/separator-main-nav.jpg b/webapp/themes/vitro/images/separator-main-nav.jpg similarity index 100% rename from webapp/web/themes/vitro/images/separator-main-nav.jpg rename to webapp/themes/vitro/images/separator-main-nav.jpg diff --git a/webapp/web/themes/vitro/images/separator-property-group-nav.jpg b/webapp/themes/vitro/images/separator-property-group-nav.jpg similarity index 100% rename from webapp/web/themes/vitro/images/separator-property-group-nav.jpg rename to webapp/themes/vitro/images/separator-property-group-nav.jpg diff --git a/webapp/web/themes/vitro/templates/footer.ftl b/webapp/themes/vitro/templates/footer.ftl similarity index 100% rename from webapp/web/themes/vitro/templates/footer.ftl rename to webapp/themes/vitro/templates/footer.ftl diff --git a/webapp/web/themes/vitro/templates/googleAnalytics.ftl b/webapp/themes/vitro/templates/googleAnalytics.ftl similarity index 100% rename from webapp/web/themes/vitro/templates/googleAnalytics.ftl rename to webapp/themes/vitro/templates/googleAnalytics.ftl diff --git a/webapp/web/themes/vitro/templates/head.ftl b/webapp/themes/vitro/templates/head.ftl similarity index 100% rename from webapp/web/themes/vitro/templates/head.ftl rename to webapp/themes/vitro/templates/head.ftl diff --git a/webapp/web/themes/vitro/templates/identity.ftl b/webapp/themes/vitro/templates/identity.ftl similarity index 100% rename from webapp/web/themes/vitro/templates/identity.ftl rename to webapp/themes/vitro/templates/identity.ftl diff --git a/webapp/web/themes/vitro/templates/menu.ftl b/webapp/themes/vitro/templates/menu.ftl similarity index 100% rename from webapp/web/themes/vitro/templates/menu.ftl rename to webapp/themes/vitro/templates/menu.ftl diff --git a/webapp/web/themes/vitro/templates/page-home.ftl b/webapp/themes/vitro/templates/page-home.ftl similarity index 100% rename from webapp/web/themes/vitro/templates/page-home.ftl rename to webapp/themes/vitro/templates/page-home.ftl diff --git a/webapp/web/themes/vitro/templates/page.ftl b/webapp/themes/vitro/templates/page.ftl similarity index 100% rename from webapp/web/themes/vitro/templates/page.ftl rename to webapp/themes/vitro/templates/page.ftl diff --git a/webapp/config/dwr.xml b/webapp/web/WEB-INF/dwr.xml similarity index 100% rename from webapp/config/dwr.xml rename to webapp/web/WEB-INF/dwr.xml diff --git a/webapp/ontologies/app/application.owl b/webapp/web/WEB-INF/ontologies/app/application.owl similarity index 100% rename from webapp/ontologies/app/application.owl rename to webapp/web/WEB-INF/ontologies/app/application.owl diff --git a/webapp/ontologies/app/loadedAtStartup/displayModelListViews.rdf b/webapp/web/WEB-INF/ontologies/app/loadedAtStartup/displayModelListViews.rdf similarity index 100% rename from webapp/ontologies/app/loadedAtStartup/displayModelListViews.rdf rename to webapp/web/WEB-INF/ontologies/app/loadedAtStartup/displayModelListViews.rdf diff --git a/webapp/ontologies/app/menu.n3 b/webapp/web/WEB-INF/ontologies/app/menu.n3 similarity index 100% rename from webapp/ontologies/app/menu.n3 rename to webapp/web/WEB-INF/ontologies/app/menu.n3 diff --git a/webapp/ontologies/app/menuload/displayDisplay.n3 b/webapp/web/WEB-INF/ontologies/app/menuload/displayDisplay.n3 similarity index 100% rename from webapp/ontologies/app/menuload/displayDisplay.n3 rename to webapp/web/WEB-INF/ontologies/app/menuload/displayDisplay.n3 diff --git a/webapp/ontologies/app/menuload/displayTBOX.n3 b/webapp/web/WEB-INF/ontologies/app/menuload/displayTBOX.n3 similarity index 100% rename from webapp/ontologies/app/menuload/displayTBOX.n3 rename to webapp/web/WEB-INF/ontologies/app/menuload/displayTBOX.n3 diff --git a/webapp/ontologies/search/vitroSearchProhibited.n3 b/webapp/web/WEB-INF/ontologies/search/vitroSearchProhibited.n3 similarity index 100% rename from webapp/ontologies/search/vitroSearchProhibited.n3 rename to webapp/web/WEB-INF/ontologies/search/vitroSearchProhibited.n3 diff --git a/webapp/ontologies/system/vitro-0.7.owl b/webapp/web/WEB-INF/ontologies/system/vitro-0.7.owl similarity index 100% rename from webapp/ontologies/system/vitro-0.7.owl rename to webapp/web/WEB-INF/ontologies/system/vitro-0.7.owl diff --git a/webapp/ontologies/system/vitroPublic.owl b/webapp/web/WEB-INF/ontologies/system/vitroPublic.owl similarity index 100% rename from webapp/ontologies/system/vitroPublic.owl rename to webapp/web/WEB-INF/ontologies/system/vitroPublic.owl diff --git a/webapp/config/startup_listeners.txt b/webapp/web/WEB-INF/resources/startup_listeners.txt similarity index 100% rename from webapp/config/startup_listeners.txt rename to webapp/web/WEB-INF/resources/startup_listeners.txt diff --git a/webapp/config/tlds/ListSparqlTag.tld b/webapp/web/WEB-INF/tlds/ListSparqlTag.tld similarity index 100% rename from webapp/config/tlds/ListSparqlTag.tld rename to webapp/web/WEB-INF/tlds/ListSparqlTag.tld diff --git a/webapp/config/tlds/StringProcessorTag.tld b/webapp/web/WEB-INF/tlds/StringProcessorTag.tld similarity index 100% rename from webapp/config/tlds/StringProcessorTag.tld rename to webapp/web/WEB-INF/tlds/StringProcessorTag.tld diff --git a/webapp/config/tlds/VitroUtils.tld b/webapp/web/WEB-INF/tlds/VitroUtils.tld similarity index 100% rename from webapp/config/tlds/VitroUtils.tld rename to webapp/web/WEB-INF/tlds/VitroUtils.tld diff --git a/webapp/config/tlds/c.tld b/webapp/web/WEB-INF/tlds/c.tld similarity index 100% rename from webapp/config/tlds/c.tld rename to webapp/web/WEB-INF/tlds/c.tld diff --git a/webapp/config/tlds/database.tld b/webapp/web/WEB-INF/tlds/database.tld similarity index 100% rename from webapp/config/tlds/database.tld rename to webapp/web/WEB-INF/tlds/database.tld diff --git a/webapp/config/tlds/fn.tld b/webapp/web/WEB-INF/tlds/fn.tld similarity index 100% rename from webapp/config/tlds/fn.tld rename to webapp/web/WEB-INF/tlds/fn.tld diff --git a/webapp/config/tlds/form.tld b/webapp/web/WEB-INF/tlds/form.tld similarity index 100% rename from webapp/config/tlds/form.tld rename to webapp/web/WEB-INF/tlds/form.tld diff --git a/webapp/config/tlds/sparqltag.tld b/webapp/web/WEB-INF/tlds/sparqltag.tld similarity index 100% rename from webapp/config/tlds/sparqltag.tld rename to webapp/web/WEB-INF/tlds/sparqltag.tld diff --git a/webapp/config/tlds/taglibs-mailer.tld b/webapp/web/WEB-INF/tlds/taglibs-mailer.tld similarity index 100% rename from webapp/config/tlds/taglibs-mailer.tld rename to webapp/web/WEB-INF/tlds/taglibs-mailer.tld diff --git a/webapp/config/tlds/taglibs-random.tld b/webapp/web/WEB-INF/tlds/taglibs-random.tld similarity index 100% rename from webapp/config/tlds/taglibs-random.tld rename to webapp/web/WEB-INF/tlds/taglibs-random.tld diff --git a/webapp/config/tlds/taglibs-string.tld b/webapp/web/WEB-INF/tlds/taglibs-string.tld similarity index 100% rename from webapp/config/tlds/taglibs-string.tld rename to webapp/web/WEB-INF/tlds/taglibs-string.tld diff --git a/webapp/config/tlds/vitroForm.tld b/webapp/web/WEB-INF/tlds/vitroForm.tld similarity index 100% rename from webapp/config/tlds/vitroForm.tld rename to webapp/web/WEB-INF/tlds/vitroForm.tld diff --git a/webapp/config/web.xml b/webapp/web/WEB-INF/web.xml similarity index 98% rename from webapp/config/web.xml rename to webapp/web/WEB-INF/web.xml index 3e79df343..a5fc9d3af 100644 --- a/webapp/config/web.xml +++ b/webapp/web/WEB-INF/web.xml @@ -51,6 +51,15 @@ + + Startup Status Display Filter + edu.cornell.mannlib.vitro.webapp.filters.StartupStatusDisplayFilter + + + Startup Status Display Filter + /* + + Session Timeout Limiting Filter edu.cornell.mannlib.vitro.webapp.filters.SessionTimeoutLimitingFilter @@ -657,6 +666,15 @@ /admin/showAuth + + StartupStatus + edu.cornell.mannlib.vitro.webapp.controller.admin.StartupStatusController + + + StartupStatus + /startupStatus + + StatementChangeListingController edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.StatementChangeListingController