[Treebase-guts] SF.net SVN: treebase:[284] trunk/oai-pmh_data_provider/data_provider_web

[<yo...@us...>]

Revision: 284
          http://treebase.svn.sourceforge.net/treebase/?rev=284&view=rev
Author:   youjun
Date:     2009-11-18 21:08:06 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
add 3 velocity tool dependencies

Modified Paths:
--------------
    trunk/oai-pmh_data_provider/data_provider_web/pom.xml
    trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/validator/OAIPMHValidator.java
    trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/web.xml

Modified: trunk/oai-pmh_data_provider/data_provider_web/pom.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/pom.xml	2009-11-18 18:14:19 UTC (rev 283)
+++ trunk/oai-pmh_data_provider/data_provider_web/pom.xml	2009-11-18 21:08:06 UTC (rev 284)
@@ -250,7 +250,22 @@
      	<artifactId>treebase-core</artifactId>
      	<version>1.0-SNAPSHOT</version>
      </dependency>
-
+     <dependency>
+     	<groupId>velocity-tools</groupId>
+     	<artifactId>velocity-tools</artifactId>
+     	<version>1.1</version>
+     </dependency>
+     <dependency>
+     	<groupId>velocity-tools</groupId>
+     	<artifactId>velocity-tools-generic</artifactId>
+     	<version>1.1</version>
+     </dependency>
+     <dependency>
+     	<groupId>velocity-tools</groupId>
+     	<artifactId>velocity-tools-view</artifactId>
+     	<version>1.1</version>
+     </dependency>
+     
   </dependencies>
   <dependencyManagement>
   	<dependencies>

Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/validator/OAIPMHValidator.java
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/validator/OAIPMHValidator.java	2009-11-18 18:14:19 UTC (rev 283)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/validator/OAIPMHValidator.java	2009-11-18 21:08:06 UTC (rev 284)
@@ -14,9 +14,10 @@
 	public void validate(Object pValidatable, Errors pError) {
 		// ValidationUtils.rejectIfEmpty(e, "name", "name.empty");
 		OAIPMHCommand command = (OAIPMHCommand) pValidatable;				
-		String verb = command.getVerb().trim();
-		String fPrefix = command.getMetadataPrefix().trim();
 		
+		String verb = command.getVerb();
+		String fPrefix = command.getMetadataPrefix();
+		
 		ValidationUtils.rejectIfEmptyOrWhitespace(pError, "verb", "empyt verb");
 		if(verb=="GetRecord")
 			ValidationUtils.rejectIfEmptyOrWhitespace(pError, "identifier", "empyt id");

Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/web.xml	2009-11-18 18:14:19 UTC (rev 283)
+++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/web.xml	2009-11-18 21:08:06 UTC (rev 284)
@@ -35,7 +35,7 @@
 	<!-- DispatcherServlet                                          -->
 	<!-- ========================================================== -->
 	<servlet>
-		<servlet-name>TOPServlet</servlet-name>
+		<servlet-name>top</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
@@ -57,8 +57,8 @@
 	<!-- url pattern that will be processed by DispatcherServlet    -->
 	<!-- ========================================================== -->
 	<servlet-mapping>
-		<servlet-name>TOPServlet</servlet-name>
-		<url-pattern>/top/*</url-pattern>
+		<servlet-name>top</servlet-name>
+		<url-pattern>/top/oai</url-pattern>
 	</servlet-mapping>
   	
  	<!-- ========================================================== -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.