Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[674] trunk/treebase-web/src/main
|
From: <yo...@us...> - 2010-04-03 17:43:13
|
Revision: 674
http://treebase.svn.sourceforge.net/treebase/?rev=674&view=rev
Author: youjun
Date: 2010-04-03 17:43:07 +0000 (Sat, 03 Apr 2010)
Log Message:
-----------
modify configure files to import oai-pmh-provider
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/OAIPMHController.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/Identify.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/OAIPMHCommand.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/IdentifyUtil.java
trunk/treebase-web/src/main/java/org/cipres/treebase/web/validators/OAIPMHValidator.java
trunk/treebase-web/src/main/webapp/WEB-INF/applicationContext.xml
trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml
trunk/treebase-web/src/main/webapp/WEB-INF/web.xml
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/OAIPMHController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/OAIPMHController.java 2010-04-03 15:01:36 UTC (rev 673)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/OAIPMHController.java 2010-04-03 17:43:07 UTC (rev 674)
@@ -1,4 +1,4 @@
-package org.treebase.oai.web.controller;
+package org.cipres.treebase.web.controllers;
import java.lang.reflect.Method;
import java.text.ParseException;
@@ -13,9 +13,9 @@
import org.springframework.validation.BindException;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.AbstractCommandController;
-import org.treebase.oai.web.command.Identify;
-import org.treebase.oai.web.command.OAIPMHCommand;
-import org.treebase.oai.web.util.IdentifyUtil;
+import org.cipres.treebase.web.model.Identify;
+import org.cipres.treebase.web.model.OAIPMHCommand;
+import org.cipres.treebase.web.util.IdentifyUtil;
import org.cipres.treebase.domain.admin.Person;
import org.cipres.treebase.domain.study.ArticleCitation;
import org.cipres.treebase.domain.study.BookCitation;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/Identify.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/Identify.java 2010-04-03 15:01:36 UTC (rev 673)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/Identify.java 2010-04-03 17:43:07 UTC (rev 674)
@@ -1,4 +1,4 @@
-package org.treebase.oai.web.command;
+package org.cipres.treebase.web.model;
import java.text.SimpleDateFormat;
import java.util.Calendar;
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/OAIPMHCommand.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/OAIPMHCommand.java 2010-04-03 15:01:36 UTC (rev 673)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/model/OAIPMHCommand.java 2010-04-03 17:43:07 UTC (rev 674)
@@ -1,4 +1,4 @@
-package org.treebase.oai.web.command;
+package org.cipres.treebase.web.model;
/**
*
* @author youjun
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/IdentifyUtil.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/IdentifyUtil.java 2010-04-03 15:01:36 UTC (rev 673)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/util/IdentifyUtil.java 2010-04-03 17:43:07 UTC (rev 674)
@@ -1,4 +1,4 @@
-package org.treebase.oai.web.util;
+package org.cipres.treebase.web.util;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -7,8 +7,8 @@
import java.util.GregorianCalendar;
import java.util.TimeZone;
-import org.treebase.oai.web.command.Identify;
-import org.treebase.oai.web.command.OAIPMHCommand;
+import org.cipres.treebase.web.model.Identify;
+import org.cipres.treebase.web.model.OAIPMHCommand;
/*
*
* @author youjun
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/validators/OAIPMHValidator.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/validators/OAIPMHValidator.java 2010-04-03 15:01:36 UTC (rev 673)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/validators/OAIPMHValidator.java 2010-04-03 17:43:07 UTC (rev 674)
@@ -1,9 +1,9 @@
-package org.treebase.oai.web.validator;
+package org.cipres.treebase.web.validators;
import org.springframework.validation.Errors;
import org.springframework.validation.ValidationUtils;
import org.springframework.validation.Validator;
-import org.treebase.oai.web.command.OAIPMHCommand;
+import org.cipres.treebase.web.model.OAIPMHCommand;
public class OAIPMHValidator implements Validator {
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/applicationContext.xml
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/applicationContext.xml 2010-04-03 15:01:36 UTC (rev 673)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/applicationContext.xml 2010-04-03 17:43:07 UTC (rev 674)
@@ -11,6 +11,36 @@
<!-- ========================================================== -->
+ <!-- oai-pmh-provider properties bean-->
+ <!-- ========================================================== -->
+
+ <bean id="top.propertyConfigurer"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="ignoreUnresolvablePlaceholders" value="true" />
+ <property name="locations">
+ <list>
+ <value>/WEB-INF/identify.properties</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="top.identify" class="org.cipres.treebase.web.model.Identify">
+ <property name="baseURL" value="${identify.baseURL}" />
+ <property name="repositoryName" value="${identify.repositoryName}" />
+ <property name="protocolVersion" value="${identify.protocolVersion}" />
+ <property name="adminEmail" value="${identify.adminEmail}" />
+ <property name="earliestDatestamp" value="${identify.earliestDatestamp}" />
+ <property name="deletedRecord" value="${identify.deletedRecord}" />
+ <property name="granularity" value="${identify.granularity}" />
+ <property name="granularityPattern" value="${identify.granularityPattern}" />
+ <property name="repositoryIdentifier" value="${identify.repositoryIdentifier}" />
+ <property name="sampleIdentifier" value="${identify.sampleIdentifier}" />
+ <property name="identifierDelimiter" value="${identify.identifierDelimiter}" />
+ <property name="dublinPerfix" value="${identify.dublinPerfix}" />
+ <property name="dryadPerfix" value="${identify.dryadPerfix}" />
+ </bean>
+
+ <!-- ========================================================== -->
<!-- LIST OF DWR beans/methods -->
<!-- ========================================================== -->
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2010-04-03 15:01:36 UTC (rev 673)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2010-04-03 17:43:07 UTC (rev 674)
@@ -8,6 +8,16 @@
http://www.directwebremoting.org/schema/spring-dwr
http://www.directwebremoting.org/schema/spring-dwr-2.0.xsd">
+
+ <!-- ========================================================== -->
+ <!-- velocity configure -->
+ <!-- ========================================================== -->
+
+ <bean id="velocityConfigurer" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
+ <property name="resourceLoaderPath">
+ <value>WEB-INF/vmFiles/</value>
+ </property>
+ </bean>
<!-- ========================================================== -->
<!-- LIST OF CONTROLLERS FOR WEB-TIER -->
@@ -826,6 +836,16 @@
<property name="userService"><ref bean="userService"></ref></property>
<property name="helpService"><ref bean="helpService"></ref></property>
</bean>
+
+
+ <bean id="OAIPMHController" class="org.cipres.treebase.web.controllers.OAIPMHController">
+ <property name="submissionService"><ref bean="submissionService"></ref></property>
+ <property name="studyService"><ref bean="studyService"></ref></property>
+ <property name="identify"><ref bean="top.identify"></ref></property>
+ <property name="validator">
+ <bean class="org.cipres.treebase.web.validators.OAIPMHValidator"/>
+ </property>
+ </bean>
<!-- ========================================================== -->
<!-- LIST OF VALIDATORS FOR CONTROLLER -->
@@ -838,15 +858,29 @@
</bean>
<!-- ========================================================== -->
- <!-- Spring View Resolvers for JSPs -->
+ <!-- Spring View Resolvers for JSPs and .vm files -->
<!-- ========================================================== -->
- <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
- <property name="requestContextAttribute" value="rc"/>
- <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
- <property name="prefix" value="/WEB-INF/pages/"/>
- <property name="suffix" value=".jsp"/>
+
+ <bean id="vmViewResolver" class="org.springframework.web.servlet.view.velocity.VelocityViewResolver">
+ <property name="order" value="1"></property>
+ <property name="suffix">
+ <value>.vm</value>
+ </property>
+ <property name="exposeRequestAttributes">
+ <value>true</value>
+ </property>
+ <property name="exposeSessionAttributes">
+ <value>true</value>
+ </property>
</bean>
-
+
+ <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+ <property name="requestContextAttribute" value="rc"/>
+ <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
+ <property name="prefix" value="/WEB-INF/pages/"/>
+ <property name="suffix" value=".jsp"/>
+ </bean>
+
<!-- ========================================================== -->
<!-- URL MAPPING -->
<!-- ========================================================== -->
@@ -854,7 +888,8 @@
<property name="alwaysUseFullPath" value="true"/>
<property name="mappings">
- <props>
+ <props>
+ <prop key="/top/**">OAIPMHController</prop>
<prop key="/phylows/**">phyloWSController</prop>
<prop key="/about.html">filenameController</prop>
<prop key="/home.html">filenameController</prop>
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/web.xml 2010-04-03 15:01:36 UTC (rev 673)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/web.xml 2010-04-03 17:43:07 UTC (rev 674)
@@ -209,6 +209,10 @@
<servlet-name>treebase</servlet-name>
<url-pattern>/phylows/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>treebase</servlet-name>
+ <url-pattern>/top/*</url-pattern>
+ </servlet-mapping>
<!-- ========================================================== -->
<!-- url pattern that will be processed by XFireSpringServlet -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
