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

NIHVIVO-3665 - vitro components for new class hierarchy

Browse source
This commit is contained in:
tworrall 2012-05-08 19:04:32 +00:00
parent 29e4edc25d
commit 79cd09e2fa
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
webapp/build.xml
View file

@ -115,7 +115,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
</not> </not>
</condition> </condition>
</fail> </fail>
<!--
<fail message="The vitro.home.directory &quot;${vitro.home.directory}&quot; is not writable."> <fail message="The vitro.home.directory &quot;${vitro.home.directory}&quot; is not writable.">
<condition> <condition>
<not> <not>
@ -125,7 +125,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
</not> </not>
</condition> </condition>
</fail> </fail>
-->
<property name="solr.home.dir" location="${vitro.home.directory}/solr" /> <property name="solr.home.dir" location="${vitro.home.directory}/solr" />
</target> </target>
@ -137,15 +137,15 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<delete dir="${solr.home.dir}" excludes="data/**/*" includeemptydirs="true" /> <delete dir="${solr.home.dir}" excludes="data/**/*" includeemptydirs="true" />
</target> </target>
<!-- - - - - - - - - - - - - - - - - - <!-- - - - - - - - - - - - - - - - - -
target: compileUtilities target: compileUtilities
- - - - - - - - - - - - - - - - - --> - - - - - - - - - - - - - - - - - -->
<target name="compileUtilities"> <target name="compileUtilities">
<mkdir dir="${utility.classes.dir}" /> <mkdir dir="${utility.classes.dir}" />
<javac srcdir="${utilities.source.dir}" destdir="${utility.classes.dir}" debug="true" deprecation="${javac.deprecation}" encoding="UTF8" includeantruntime="false" optimize="false" source="1.6"> <javac srcdir="${utilities.source.dir}" destdir="${utility.classes.dir}" debug="true" deprecation="${javac.deprecation}" encoding="UTF8" includeantruntime="false" optimize="false" source="1.6">
<classpath refid="utility.compile.classpath" /> <classpath refid="utility.compile.classpath" />
</javac> </javac>
</target> </target>
<!-- - - - - - - - - - - - - - - - - - <!-- - - - - - - - - - - - - - - - - -
target: prepare target: prepare

18
webapp/web/WEB-INF/web.xml
View file

@ -614,11 +614,11 @@
</servlet-mapping> </servlet-mapping>
<servlet> <servlet>
<servlet-name>AllClassGroupsListingController</servlet-name> <servlet-name>ListClassGroupsController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.AllClassGroupsListingController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListClassGroupsController</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>AllClassGroupsListingController</servlet-name> <servlet-name>ListClassGroupsController</servlet-name>
<url-pattern>/listGroups</url-pattern> <url-pattern>/listGroups</url-pattern>
</servlet-mapping> </servlet-mapping>
@ -758,11 +758,11 @@
</servlet-mapping> </servlet-mapping>
<servlet> <servlet>
<servlet-name>VClassWebappsListingController</servlet-name> <servlet-name>ListVClassWebappsController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.VClassWebappsListingController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListVClassWebappsController</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>VClassWebappsListingController</servlet-name> <servlet-name>ListVClassWebappsController</servlet-name>
<url-pattern>/listVClassWebapps</url-pattern> <url-pattern>/listVClassWebapps</url-pattern>
</servlet-mapping> </servlet-mapping>
@ -777,11 +777,11 @@
<servlet> <servlet>
<servlet-name>ClassHierarchyListingController</servlet-name> <servlet-name>ShowClassHierarchyController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.ClassHierarchyListingController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ShowClassHierarchyController</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>ClassHierarchyListingController</servlet-name> <servlet-name>ShowClassHierarchyController</servlet-name>
<url-pattern>/showClassHierarchy</url-pattern> <url-pattern>/showClassHierarchy</url-pattern>
</servlet-mapping> </servlet-mapping>