From: <yo...@us...> - 2009-11-04 14:50:38
|
Revision: 239 http://treebase.svn.sourceforge.net/treebase/?rev=239&view=rev Author: youjun Date: 2009-11-04 14:50:28 +0000 (Wed, 04 Nov 2009) Log Message: ----------- Modified Paths: -------------- trunk/oai-pmh_data_provider/data_provider_web/.classpath trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.jdt.core.prefs trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component 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/controller/OAIPMHController.java trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/applicationContext.xml trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/web.xml trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/index.jsp trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web.war trunk/oai-pmh_data_provider/data_provider_web/target/war/work/webapp-cache.xml Added Paths: ----------- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/Identify.java trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSet.vm trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/applicationContext.xml trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/lib/treebase-core-1.0-SNAPSHOT.jar trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-security.xml trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-servlet.xml trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-403.jsp trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-404.jsp trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-500.jsp trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error.jsp trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/uncaughtException.jsp Modified: trunk/oai-pmh_data_provider/data_provider_web/.classpath =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/.classpath 2009-11-04 14:18:58 UTC (rev 238) +++ trunk/oai-pmh_data_provider/data_provider_web/.classpath 2009-11-04 14:50:28 UTC (rev 239) @@ -12,5 +12,6 @@ </classpathentry> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="lib" path="/treebase/treebase-core/target/treebase-core-1.0-SNAPSHOT.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.jdt.core.prefs 2009-11-04 14:18:58 UTC (rev 238) +++ trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.jdt.core.prefs 2009-11-04 14:50:28 UTC (rev 239) @@ -1,7 +1,12 @@ -#Tue Oct 13 10:33:14 EDT 2009 +#Mon Nov 02 11:24:22 EST 2009 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.source=1.5 Modified: trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component 2009-11-04 14:18:58 UTC (rev 238) +++ trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component 2009-11-04 14:50:28 UTC (rev 239) @@ -4,7 +4,7 @@ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/" source-path="/src/main/webapp"/> - <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/treebase-core/treebase-core"> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/treebase/treebase"> <dependency-type>uses</dependency-type> </dependent-module> <property name="context-root" value="data_provider_web"/> Modified: trunk/oai-pmh_data_provider/data_provider_web/pom.xml =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/pom.xml 2009-11-04 14:18:58 UTC (rev 238) +++ trunk/oai-pmh_data_provider/data_provider_web/pom.xml 2009-11-04 14:50:28 UTC (rev 239) @@ -256,6 +256,7 @@ <artifactId>treebase-core</artifactId> <version>1.0-SNAPSHOT</version> </dependency> + <!-- used by Spring framework --> <!--Older ersion not needed--> Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/Identify.java =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/Identify.java (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/command/Identify.java 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,73 @@ +package org.treebase.oai.web.command; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.SimpleTimeZone; +import java.util.TimeZone; + + +public class Identify { + + private String baseRUL; + private String repositoryName; + private String protocolVersion; + private String adminEmail; + private String earliestDatestamp; + private String deletedRecord; + private String granularity; + private String granularityPattern; + + public String getBaseRUL() { + return baseRUL; + } + public void setBaseRUL(String baseRUL) { + this.baseRUL = baseRUL; + } + public String getRepositoryName() { + return repositoryName; + } + public void setRepositoryName(String repositoryName) { + this.repositoryName = repositoryName; + } + public String getProtocolVersion() { + return protocolVersion; + } + public void setProtocolVersion(String protocolVersion) { + this.protocolVersion = protocolVersion; + } + public String getAdminEmail() { + return adminEmail; + } + public void setAdminEmail(String adminEmail) { + this.adminEmail = adminEmail; + } + public String getEarliestDatestamp() { + return earliestDatestamp; + } + public void setEarliestDatestamp(String earliestDatestamp) { + this.earliestDatestamp = earliestDatestamp; + } + public String getDeletedRecord() { + return deletedRecord; + } + public void setDeletedRecord(String deletedRecord) { + this.deletedRecord = deletedRecord; + } + public String getGranularity() { + return granularity; + } + public void setGranularity(String granularity) { + this.granularity = granularity; + } + + public String getResponseDate(Date date){ + SimpleDateFormat format = new SimpleDateFormat(granularityPattern); + Calendar cal = Calendar.getInstance(new SimpleTimeZone(0, "GMT")); + format.setCalendar(cal); + return format.format(date); + + } + +} Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-04 14:18:58 UTC (rev 238) +++ trunk/oai-pmh_data_provider/data_provider_web/src/main/java/org/treebase/oai/web/controller/OAIPMHController.java 2009-11-04 14:50:28 UTC (rev 239) @@ -10,20 +10,48 @@ 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.cipres.treebase.domain.study.SubmissionService; import org.cipres.treebase.domain.study.StudyService; public class OAIPMHController extends AbstractCommandController{ - + private SubmissionService submissionService; private StudyService studyService; + private Identify identify; public OAIPMHController(){ setCommandClass(OAIPMHCommand.class); - setCommandName("params"); + setCommandName("requestParams"); } + public SubmissionService getSubmissionService() { + return submissionService; + } + + public void setSubmissionService(SubmissionService submissionService) { + this.submissionService = submissionService; + } + + public StudyService getStudyService() { + return studyService; + } + + public void setStudyService(StudyService studyService) { + this.studyService = studyService; + } + + public Identify getIdentify() { + return identify; + } + + public void setIdentify(Identify identify) { + this.identify = identify; + } + + + @Override protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) @@ -33,56 +61,59 @@ OAIPMHCommand params = (OAIPMHCommand) command; Map model=errors.getModel(); - model.put("params", params); + model.put("requestParams", params); + model.put("identify", this.identify); + String responsDate; + Method method=null; try{ - method=this.getClass().getMethod(params.getVerb(), new Class[]{HttpServletRequest.class, HttpServletResponse.class, Map.class}); + method=this.getClass().getMethod(params.getVerb(), new Class[]{HttpServletRequest.class, HttpServletResponse.class, OAIPMHCommand.class, Map.class}); }catch(NoSuchMethodException e){ return new ModelAndView("badVerb.vm",model); } - return (ModelAndView) method.invoke(this, request, response, model); + return (ModelAndView) method.invoke(this, request, response, params, model); } - ModelAndView ListRecoed(HttpServletRequest request, HttpServletResponse response, Map model){ + ModelAndView ListRecoed(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){ - return (new ModelAndView(metadataPrefix+"_ListRecoed.vm",model)); + return (new ModelAndView(params.getMetadataPrefix()+"_ListRecoed.vm",model)); } - - + - ModelAndView ListIdentifiers(HttpServletRequest request, HttpServletResponse response, Map model){ - metadataPrefix - return (new ModelAndView(metadataPrefix+"_ListIdentifiers.vm",model)); + ModelAndView ListIdentifiers(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){ + + return (new ModelAndView(params.getMetadataPrefix()+"_ListIdentifiers.vm",model)); } - ModelAndView GetRecord(HttpServletRequest request, HttpServletResponse response, Map model){ - metadataPrefix - return (new ModelAndView(metadataPrefix+"_GetRecord.vm",model)); + ModelAndView GetRecord(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){ + + return (new ModelAndView(params.getMetadataPrefix()+"_GetRecord.vm",model)); } - ModelAndView Identify(HttpServletRequest request, HttpServletResponse response, Map model){ + ModelAndView Identify(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){ return (new ModelAndView("Identify.vm",model)); } - ModelAndView ListSet(HttpServletRequest request, HttpServletResponse response, Map model){ + ModelAndView ListSet(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){ return (new ModelAndView("ListSet.vm",model)); } - ModelAndView ListMetadataFormats(HttpServletRequest request, HttpServletResponse response, Map model){ + ModelAndView ListMetadataFormats(HttpServletRequest request, HttpServletResponse response, OAIPMHCommand params, Map model){ return (new ModelAndView("ListMetadataFormats.vm",model)); } + } Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/applicationContext.xml =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/applicationContext.xml 2009-11-04 14:18:58 UTC (rev 238) +++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/applicationContext.xml 2009-11-04 14:50:28 UTC (rev 239) @@ -9,6 +9,28 @@ http://www.directwebremoting.org/schema/spring-dwr http://www.directwebremoting.org/schema/spring-dwr-2.0.xsd"> + <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.treebase.oai.web.command.Identify"> + <property name="baseRUL" value="${identify.baseRUL}" /> + <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}" /> + + </bean> + <!-- ========================================================== --> <!-- LIST OF DWR beans/methods --> <!-- ========================================================== --> Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/identify.properties 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,8 @@ +identify.baseRUL=www.***/top.edu +identify.repositoryName=org.treebase.oai +identify.protocolVersion=2.0 +identify.adminEmail=you...@ya... +identify.earliestDatestamp=1995-11-04T00:00:00Z +identify.deletedRecord=transient +identify.granularity=YYYY-MM-DDThh:mm:ssZ +identify.granularityPattern=yyyy-MM-dd'T'hh:mm:ss'Z' \ No newline at end of file Modified: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml 2009-11-04 14:18:58 UTC (rev 238) +++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/top-servlet.xml 2009-11-04 14:50:28 UTC (rev 239) @@ -25,6 +25,7 @@ <bean id="OAIPMHController" class="org.treebase.oai.web.controller.OAIPMHController"> <property name="submissionService"><ref bean="submissionService"></ref></property> <property name="studyService"><ref bean="studyphyloTreeService"></ref></property> + <property name="identify"><ref bean="top.identify"></ref></property> </bean> Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/Identify.vm 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/ + http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd"> + <responseDate>${now()}</responseDate> + <request verb="Identify">${identify.baseRUL}</request> + <Identify> + <repositoryName>${identify.repositoryName}</repositoryName> + <baseURL>${identify.baseRUL}</baseURL> + <protocolVersion>${identify.protocolVersion}</protocolVersion> + <adminEmail>${identify.adminEmail}</adminEmail> + <earliestDatestamp>${identify.earliestDatestamp}</earliestDatestamp> + <deletedRecord>${identify.deletedRecord}</deletedRecord> + <granularity>${identify.granularity}</granularity> + + <description> + <oai-identifier + xmlns="http://www.openarchives.org/OAI/2.0/oai-identifier" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation= + "http://www.openarchives.org/OAI/2.0/oai-identifier + http://www.openarchives.org/OAI/2.0/oai-identifier.xsd"> + <scheme>oai</scheme> + <repositoryIdentifier>${identify.repositoryIdentifier}</repositoryIdentifier> + <delimiter>:</delimiter> + <sampleIdentifier>${identify.sampleIdentifier}</sampleIdentifier> + </oai-identifier> + </description> + + </Identify> +</OAI-PMH> Added: trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSet.vm =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSet.vm (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/src/main/webapp/WEB-INF/vmFiles/ListSet.vm 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/ + http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd"> + <responseDate>${identify.responseDate}</responseDate> + <request verb="ListSets"> + ${identify.baseURL}</request> + <error code="noSetHierarchy">This repository does not + support sets</error> +</OAI-PMH> Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/applicationContext.xml =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/applicationContext.xml (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/applicationContext.xml 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans default-autowire="no" + xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:dwr="http://www.directwebremoting.org/schema/spring-dwr" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.directwebremoting.org/schema/spring-dwr + http://www.directwebremoting.org/schema/spring-dwr-2.0.xsd"> + + <!-- ========================================================== --> + <!-- LIST OF DWR beans/methods --> + <!-- ========================================================== --> + + + + <!-- bean id="remoteAjaxProgressListener" class="org.cipres.treebase.web.controllers.AjaxProgressListener"> + <dwr:remote javascript="RemoteAjaxProgressListener"> + <dwr:include method="getStatus"/> + </dwr:remote> + </bean --> + <!-- dwr:configuration> + <dwr:convert type="bean" class="org.cipres.treebase.web.model.UploadInfoBean"/> + </dwr:configuration --> + + + +</beans> Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/lib/treebase-core-1.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/lib/treebase-core-1.0-SNAPSHOT.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-security.xml =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-security.xml (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-security.xml 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" + "http://www.springframework.org/dtd/spring-beans.dtd"> + +<beans default-autowire="no"> + + <!-- ======================== FILTER CHAIN ======================= --> + <!-- if you wish to use channel security, add "channelProcessingFilter," + in front of "httpSessionContextIntegrationFilter" in the list below --> + <bean id="filterChainProxy" class="org.acegisecurity.util.FilterChainProxy"> + <property name="filterInvocationDefinitionSource"> + <value> + CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON + PATTERN_TYPE_APACHE_ANT + /**=httpSessionContextIntegrationFilter,authenticationProcessingFilter,requestMethodsFilter,exceptionTranslationFilter,filterInvocationInterceptor + </value> + </property> + </bean> + + <!-- ======================== AUTHENTICATION MANAGER AND ITS DEPENDENTS ======================= --> + <bean id="authenticationManager" class="org.acegisecurity.providers.ProviderManager"> + <property name="providers"> + <list> + <ref local="daoAuthenticationProvider"/> + </list> + </property> + </bean> + + <bean id="daoAuthenticationProvider" class="org.acegisecurity.providers.dao.DaoAuthenticationProvider"> + <property name="userDetailsService"><ref bean ="userService"/></property> + <!-- encrypt password instead of storing in clear text in DB --> + <!-- property name="passwordEncoder" ref="passwordEncoder"/ --> + <!-- the next 2 lines are for debugging purpose --> + <!-- property name="userDetailsService" ref="jdbcDaoImpl"/ --> + <!-- property name="userDetailsService" ref="myUserServices"/ --> + </bean> + <!-- bean id="passwordEncoder" class="org.acegisecurity.providers.encoding.ShaPasswordEncoder"/ --> + + <!-- bean id="myUserServices" class="org.cipres.treebase.web.controllers.UserDAOImpl"/ --> + <!-- use JDBC for authentication: only for debugging --> + <!-- bean id="jdbcDaoImpl" class="org.acegisecurity.userdetails.jdbc.JdbcDaoImpl"> + <property name="dataSource"><ref bean="securityDataSource"/></property> + <property name="usersByUsernameQuery"> + <value>SELECT username, password, 'true' as enabled FROM user WHERE username=?</value> + </property> + <property name="authoritiesByUsernameQuery"> + <value>SELECT 'lcchan' as username, 'user' as rolename FROM user WHERE username=? </value> + </property> + </bean --> + <!-- =========================== HTTP REQUEST SECURITY ======================================== --> + <!-- Filter to propagate the established Authentication object through all requests --> + <bean id="httpSessionContextIntegrationFilter" class="org.acegisecurity.context.HttpSessionContextIntegrationFilter"/> + + <!-- Filter to handle FORM authentication --> + <bean id="authenticationProcessingFilter" class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilter"> + <property name="authenticationManager" ref="authenticationManager"/> + <property name="authenticationFailureUrl" value="/login.jsp?error=true"/> + <property name="defaultTargetUrl" value="/user/processUser.html"/> + <property name="filterProcessesUrl" value="/j_security_check"/> + <property name="alwaysUseDefaultTargetUrl" value="true"/> + </bean> + + <!-- Filter to link defintions of secured resources with the appropriate access control mechanism --> + <bean id="exceptionTranslationFilter" class="org.acegisecurity.ui.ExceptionTranslationFilter"> + <property name="authenticationEntryPoint" ref="authenticationProcessingFilterEntryPoint"/> + </bean> + + <bean id="requestMethodsFilter" class="org.acegisecurity.wrapper.SecurityContextHolderAwareRequestFilter"/> + + <!-- ======================== FILTER SECURITY INTERCEPTOR ======================= --> + <!-- Note the order that entries are placed against the objectDefinitionSource is critical. + The FilterSecurityInterceptor will work from the top of the list down to the FIRST pattern + that matches the request URL. Accordingly, you should place MOST SPECIFIC (ie a/b/c/d.*) + expressions first, with LEAST SPECIFIC (ie a/.*) expressions last --> + <bean id="filterInvocationInterceptor" class="org.acegisecurity.intercept.web.FilterSecurityInterceptor"> + <property name="authenticationManager"><ref local ="authenticationManager"/></property> + <property name="accessDecisionManager"><ref local ="accessDecisionManager"/></property> + <property name="objectDefinitionSource"> + <value> + CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON + PATTERN_TYPE_APACHE_ANT + /submit.html=User,Admin, Associate Editor + /user/*=User,Admin, Associate Editor + /admin/*=Admin, Associate Editor + </value> + </property> + </bean> + + <!-- ======================== ACCESSDECISION MANAGER AND ITS DEPENDENTS ======================= --> + <bean id="accessDecisionManager" class="org.acegisecurity.vote.AffirmativeBased"> + <property name="allowIfAllAbstainDecisions" value="false"/> + <property name="decisionVoters"> + <list> + <ref local ="roleVoter"/> + </list> + </property> + </bean> + + <bean id="roleVoter" class="org.acegisecurity.vote.RoleVoter"> + <property name="rolePrefix" value=""/> + </bean> + + <!-- ======================== AUTHENTICATION ENTRY POINT ======================= --> + <bean id="authenticationProcessingFilterEntryPoint" class="org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint"> + <property name="loginFormUrl"><value>/login.jsp</value></property> + <property name="forceHttps"><value>false</value></property> + </bean> + +</beans> Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-servlet.xml =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-servlet.xml (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/top-servlet.xml 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:dwr="http://www.directwebremoting.org/schema/spring-dwr" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + 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 VERBS AND FORMATS --> + <!-- ========================================================== --> + + <!--bean id="appletInteractionController" class="org.cipres.treebase.web.controllers.AppletInteractionController"> + <property name="phyloTreeService"><ref bean="phyloTreeService"></ref></property> + </bean--> + + + <!-- ========================================================== --> + <!-- LIST OF VALIDATORS FOR CONTROLLER --> + <!-- ========================================================== --> + + + <!-- ========================================================== --> + <!-- MESSAGE SOURCE DEFINITION --> + <!-- ========================================================== --> + <!--bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource"> + <property name="basename"><value>ApplicationResources</value></property> + </bean--> + + <!-- ========================================================== --> + <!-- Spring View Resolvers for Templates --> + <!-- ========================================================== --> + <bean id="viewResolver" class="org.springframework.web.servlet.view.velocity.VelocityViewResolver"> + <property name="suffix"> + <value>.vm</value> + </property> + <property name="exposeRequestAttributes"> + <value>true</value> + </property> + <property name="exposeSessionAttributes"> + <value>true</value> + </property> + </bean> + + <!-- ========================================================== --> + <!-- URL MAPPING --> + <!-- ========================================================== --> + <bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping"> + + <property name="alwaysUseFullPath" value="true"/> + <property name="mappings"> + <props> + <!--prop key="/oai-pmh verbs/metadata formats/paramaters</prop--> + </props> + </property> + </bean> + <!-- ==================================================================================================== --> + <!-- Exception Mappings --> + <!-- This bean resolves specific types of exception to corresponding error views --> + <!-- The default behavior of DispatcherServlet is to propagate all exceptions to the servlet container --> + <!-- This will happen here with all other types of exception --> + <!-- ==================================================================================================== --> + <!--bean id="exceptionResolver" class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver"> + <property name="exceptionMappings"> + <props> + <prop key="org.springframework.dao.DataAccessException">/errors/dataAccessFailure</prop> + <prop key="org.springframework.transaction.TransactionException">/errors/dataAccessFailure</prop> + <prop key="org.cipres.treebase.web.exceptions.EmptyStudyException">/errors/studyAccessFailure</prop> + </props> + </property> + </bean--> + +</beans> Modified: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/web.xml =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/web.xml 2009-11-04 14:18:58 UTC (rev 238) +++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/WEB-INF/web.xml 2009-11-04 14:50:28 UTC (rev 239) @@ -1,7 +1,78 @@ -<!DOCTYPE web-app PUBLIC - "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd" > +<?xml version="1.0" encoding="UTF-8"?> +<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <display-name>Treebase OAI-PMH Provider</display-name> + + <context-param> + <param-name>contextConfigLocation</param-name> + <param-value> + classpath*:applicationContext-dao.xml, + classpath*:applicationContext-service.xml, + /WEB-INF/applicationContext.xml, + <!-- top is short for Treebase OAI-PMH Provider --> + <!-- /WEB-INF/top-security.xml,--> + <!-- /WEB-INF/top-validation.xml--> + <!-- validation will be done on server side --> + <!-- errors will be return as oai-pmh exception with vm --> + </param-value> + </context-param> -<web-app> - <display-name>Archetype Created Web Application</display-name> + <!-- ========================================================== --> + <!-- define the listener, one of the 3 ways to start spring --> + <!-- ========================================================== --> + <!-- listener initial the spring container while webapp start --> + <listener> + <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> + </listener> + <!-- extends customize and replaces ContextLoaderListener --> + <!-- listener> + <listener-class>org.cipres.treebase.web.listeners.StartupListener</listener-class> + </listener --> + + + <!-- ========================================================== --> + <!-- Name of our servlet processed by Spring's front controller --> + <!-- DispatcherServlet --> + <!-- ========================================================== --> + <servlet> + <servlet-name>TOPServlet</servlet-name> + <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + + <!-- ========================================================== --> + <!-- Processed by CXFServlet --> + <!-- ========================================================== --> + <!--servlet> + <servlet-name>CXFServlet</servlet-name> + <servlet-class> + org.apache.cxf.transport.servlet.CXFServlet + </servlet-class> + </servlet--> + + + + <!-- ========================================================== --> + <!-- url pattern that will be processed by DispatcherServlet --> + <!-- ========================================================== --> + <servlet-mapping> + <servlet-name>TOPServlet</servlet-name> + <url-pattern>/top/*</url-pattern> + </servlet-mapping> + + <!-- ========================================================== --> + <!-- url pattern that will be processed by CXFServlet --> + <!-- ========================================================== --> + <!--servlet-mapping> + <servlet-name>CXFServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping--> + + + <!-- ========================================================== --> + <!-- Error Pages --> + <!-- ========================================================== --> + <!-- or errors will return as oai-pmh exception based on .vm files --> + </web-app> Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-403.jsp =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-403.jsp (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-403.jsp 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,14 @@ +<%@ include file="/common/taglibs.jsp"%> + +<page:applyDecorator name="default"> + +<title><fmt:message key="403.title"/></title> +<content tag="heading"><fmt:message key="403.title"/></content> + +<p> + <fmt:message key="403.message"> + <fmt:param><c:url value="/"/></fmt:param> + </fmt:message> +</p> + +</page:applyDecorator> Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-404.jsp =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-404.jsp (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-404.jsp 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,13 @@ +<%@ include file="/common/taglibs.jsp"%> + +<page:applyDecorator name="default"> + +<title><fmt:message key="404.title"/></title> +<content tag="heading"><fmt:message key="404.title"/></content> + +<p> + <fmt:message key="404.message"> + <fmt:param><c:url value="/home.html"/></fmt:param> + </fmt:message> +</p> +</page:applyDecorator> Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-500.jsp =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-500.jsp (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error-500.jsp 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,28 @@ +<%@ page language="java" isErrorPage="true" %> +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html> +<head> + <title><fmt:message key="errorPage.title"/></title> + <link rel="stylesheet" type="text/css" media="all" href="<c:url value="/styles/treebase.css"/>" /> +</head> + +<body> +<div id="screen"> + <div id="content"> + <h1><fmt:message key="errorPage.heading"/></h1> + <%@ include file="/common/messages.jsp" %> + <% if (exception != null) { %> + <pre><% exception.printStackTrace(new java.io.PrintWriter(out)); %></pre> + <% } else if ((Exception)request.getAttribute("javax.servlet.error.exception") != null) { %> + <pre><% ((Exception)request.getAttribute("javax.servlet.error.exception")) + .printStackTrace(new java.io.PrintWriter(out)); %></pre> + <% } %> + </div> +</div> +</body> +</html> Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error.jsp =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error.jsp (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/error.jsp 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,28 @@ +<%@ page language="java" isErrorPage="true" %> +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html> +<head> + <title><fmt:message key="errorPage.title"/></title> + <link rel="stylesheet" type="text/css" media="all" href="<c:url value="/styles/default.css"/>" /> +</head> + +<body> +<div id="screen"> + <div id="content"> + <h1><fmt:message key="errorPage.heading"/></h1> + <!-- %@ include file="/common/messages.jsp" % --> + <% if (exception != null) { %> + <pre><% exception.printStackTrace(new java.io.PrintWriter(out)); %></pre> + <% } else if ((Exception)request.getAttribute("javax.servlet.error.exception") != null) { %> + <pre><% ((Exception)request.getAttribute("javax.servlet.error.exception")) + .printStackTrace(new java.io.PrintWriter(out)); %></pre> + <% } %> + </div> +</div> +</body> +</html> Modified: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/index.jsp =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/index.jsp 2009-11-04 14:18:58 UTC (rev 238) +++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/index.jsp 2009-11-04 14:50:28 UTC (rev 239) @@ -1,5 +1,3 @@ -<html> -<body> -<h2>Hello World!</h2> -</body> -</html> +<%@ include file="/common/taglibs.jsp" %> + +<c:redirect url="/home.html"/> \ No newline at end of file Added: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/uncaughtException.jsp =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/uncaughtException.jsp (rev 0) +++ trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web/uncaughtException.jsp 2009-11-04 14:50:28 UTC (rev 239) @@ -0,0 +1,46 @@ +<%@ include file="/common/taglibs.jsp" %> + +<title>Java Uncaught Exception</title> +<content tag="heading">Uncaught Exception Encountered</content> + +<p> + +<% +try { + // The Servlet spec guarantees this attribute will be available + Throwable exception = (Throwable) request.getAttribute("javax.servlet.error.exception"); + + if (exception != null) { + if (exception instanceof ServletException) { + // It's a ServletException: we should extract the root cause + ServletException sex = (ServletException) exception; + Throwable rootCause = sex.getRootCause(); + if (rootCause == null) + rootCause = sex; + out.println("** Root cause is: "+ rootCause.getMessage()); + rootCause.printStackTrace(new java.io.PrintWriter(out)); + } + else { + // It's not a ServletException, so we'll just show it + exception.printStackTrace(new java.io.PrintWriter(out)); + } + } + else { + out.println("No error information available"); + } + + // Display cookies + out.println("\nCookies:\n"); + Cookie[] cookies = request.getCookies(); + if (cookies != null) { + for (int i = 0; i < cookies.length; i++) { + out.println(cookies[i].getName() + "=[" + cookies[i].getValue() + "]"); + } + } + +} catch (Exception ex) { + ex.printStackTrace(new java.io.PrintWriter(out)); +} +%> +<p> + Modified: trunk/oai-pmh_data_provider/data_provider_web/target/data_provider_web.war =================================================================== (Binary files differ) Modified: trunk/oai-pmh_data_provider/data_provider_web/target/war/work/webapp-cache.xml =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/target/war/work/webapp-cache.xml 2009-11-04 14:18:58 UTC (rev 238) +++ trunk/oai-pmh_data_provider/data_provider_web/target/war/work/webapp-cache.xml 2009-11-04 14:50:28 UTC (rev 239) @@ -4,8 +4,16 @@ <string>currentBuild</string> <path-set> <pathsSet class="linked-hash-set"> + <string>error-403.jsp</string> + <string>error-404.jsp</string> + <string>error-500.jsp</string> + <string>error.jsp</string> <string>index.jsp</string> <string>META-INF/MANIFEST.MF</string> + <string>uncaughtException.jsp</string> + <string>WEB-INF/applicationContext.xml</string> + <string>WEB-INF/top-security.xml</string> + <string>WEB-INF/top-servlet.xml</string> <string>WEB-INF/web.xml</string> <string>WEB-INF/lib/spring-2.0.7.jar</string> <string>WEB-INF/lib/commons-logging-1.1.jar</string> @@ -13,79 +21,20 @@ <string>WEB-INF/lib/logkit-1.0.1.jar</string> <string>WEB-INF/lib/avalon-framework-4.1.3.jar</string> <string>WEB-INF/lib/servlet-api-2.4.jar</string> - <string>WEB-INF/lib/data_provider_core-0.0.1-SNAPSHOT.jar</string> - <string>WEB-INF/lib/postgresql-8.3-603.jdbc3.jar</string> - <string>WEB-INF/lib/acegi-security-1.0.1.jar</string> - <string>WEB-INF/lib/commons-codec-1.3.jar</string> - <string>WEB-INF/lib/oro-2.0.8.jar</string> - <string>WEB-INF/lib/commons-collections-3.1.jar</string> - <string>WEB-INF/lib/c3p0-0.9.1.2.jar</string> - <string>WEB-INF/lib/hibernate-annotations-3.3.1.GA.jar</string> - <string>WEB-INF/lib/hibernate-3.2.6.ga.jar</string> - <string>WEB-INF/lib/ehcache-1.2.3.jar</string> - <string>WEB-INF/lib/jta-1.0.1B.jar</string> - <string>WEB-INF/lib/dom4j-1.6.1.jar</string> - <string>WEB-INF/lib/antlr-2.7.6.jar</string> - <string>WEB-INF/lib/hibernate-commons-annotations-3.0.0.ga.jar</string> - <string>WEB-INF/lib/ejb3-persistence-1.0.1.GA.jar</string> - <string>WEB-INF/lib/cglib-nodep-2.1_3.jar</string> - <string>WEB-INF/lib/commons-lang-2.3.jar</string> - <string>WEB-INF/lib/db2jcc-2.6.80.jar</string> - <string>WEB-INF/lib/db2jcc_license_cu-2.6.80.jar</string> - <string>WEB-INF/lib/jdbc-stdext-2.0.jar</string> - <string>WEB-INF/lib/jdom-1.1.jar</string> - <string>WEB-INF/lib/cxf-rt-frontend-jaxws-2.1.1.jar</string> - <string>WEB-INF/lib/geronimo-jaxws_2.1_spec-1.0.jar</string> - <string>WEB-INF/lib/geronimo-activation_1.1_spec-1.0.2.jar</string> - <string>WEB-INF/lib/cxf-api-2.1.1.jar</string> - <string>WEB-INF/lib/cxf-common-utilities-2.1.1.jar</string> - <string>WEB-INF/lib/spring-core-2.0.8.jar</string> - <string>WEB-INF/lib/spring-beans-2.0.8.jar</string> - <string>WEB-INF/lib/spring-context-2.0.8.jar</string> - <string>WEB-INF/lib/aopalliance-1.0.jar</string> - <string>WEB-INF/lib/geronimo-annotation_1.0_spec-1.1.1.jar</string> - <string>WEB-INF/lib/jaxb-api-2.1.jar</string> - <string>WEB-INF/lib/geronimo-stax-api_1.0_spec-1.0.1.jar</string> - <string>WEB-INF/lib/wsdl4j-1.6.1.jar</string> - <string>WEB-INF/lib/xml-resolver-1.2.jar</string> - <string>WEB-INF/lib/XmlSchema-1.4.2.jar</string> - <string>WEB-INF/lib/wstx-asl-3.2.4.jar</string> - <string>WEB-INF/lib/neethi-2.0.4.jar</string> - <string>WEB-INF/lib/cxf-common-schemas-2.1.1.jar</string> - <string>WEB-INF/lib/cxf-rt-core-2.1.1.jar</string> - <string>WEB-INF/lib/jaxb-impl-2.1.6.jar</string> - <string>WEB-INF/lib/geronimo-javamail_1.4_spec-1.3.jar</string> - <string>WEB-INF/lib/FastInfoset-1.2.2.jar</string> - <string>WEB-INF/lib/cxf-rt-bindings-soap-2.1.1.jar</string> - <string>WEB-INF/lib/cxf-tools-common-2.1.1.jar</string> - <string>WEB-INF/lib/velocity-1.4.jar</string> - <string>WEB-INF/lib/velocity-dep-1.4.jar</string> - <string>WEB-INF/lib/jaxb-xjc-2.1.6.jar</string> - <string>WEB-INF/lib/saaj-api-1.3.jar</string> - <string>WEB-INF/lib/geronimo-ws-metadata_2.0_spec-1.1.2.jar</string> - <string>WEB-INF/lib/cxf-rt-databinding-jaxb-2.1.1.jar</string> - <string>WEB-INF/lib/cxf-rt-bindings-xml-2.1.1.jar</string> - <string>WEB-INF/lib/cxf-rt-frontend-simple-2.1.1.jar</string> - <string>WEB-INF/lib/cxf-rt-ws-addr-2.1.1.jar</string> - <string>WEB-INF/lib/saaj-impl-1.3.jar</string> - <string>WEB-INF/lib/cxf-rt-transports-http-2.1.1.jar</string> - <string>WEB-INF/lib/spring-web-2.0.8.jar</string> - <string>WEB-INF/lib/cxf-rt-transports-http-jetty-2.1.1.jar</string> - <string>WEB-INF/lib/jetty-6.1.9.jar</string> - <string>WEB-INF/lib/jetty-util-6.1.9.jar</string> - <string>WEB-INF/lib/geronimo-servlet_2.5_spec-1.2.jar</string> - <string>WEB-INF/lib/xml-apis-1.0.b2.jar</string> <string>WEB-INF/lib/jstl-1.1.2.jar</string> <string>WEB-INF/lib/mail-1.4.jar</string> <string>WEB-INF/lib/activation-1.1.jar</string> <string>WEB-INF/lib/xalan-2.7.0.jar</string> + <string>WEB-INF/lib/xml-apis-1.0.b2.jar</string> <string>WEB-INF/lib/commons-beanutils-1.7.0.jar</string> <string>WEB-INF/lib/commons-validator-1.1.4.jar</string> + <string>WEB-INF/lib/commons-lang-2.3.jar</string> <string>WEB-INF/lib/standard-1.1.2.jar</string> <string>WEB-INF/lib/string-1.1.0.jar</string> <string>WEB-INF/lib/struts-1.2.9.jar</string> <string>WEB-INF/lib/sitemesh-2.3.jar</string> <string>WEB-INF/lib/displaytag-1.1.1.jar</string> + <string>WEB-INF/lib/commons-collections-3.1.jar</string> <string>WEB-INF/lib/itext-1.3.jar</string> <string>WEB-INF/lib/jcl104-over-slf4j-1.4.2.jar</string> <string>WEB-INF/lib/slf4j-log4j12-1.4.2.jar</string> @@ -93,12 +42,17 @@ <string>WEB-INF/lib/struts-menu-2.3.jar</string> <string>WEB-INF/lib/commons-digester-1.5.jar</string> <string>WEB-INF/lib/hsqldb-1.7.1.jar</string> + <string>WEB-INF/lib/acegi-security-1.0.1.jar</string> + <string>WEB-INF/lib/commons-codec-1.3.jar</string> + <string>WEB-INF/lib/oro-2.0.8.jar</string> <string>WEB-INF/lib/springmodules-validator-0.1.jar</string> <string>WEB-INF/lib/commons-fileupload-1.2.jar</string> <string>WEB-INF/lib/commons-io-1.3.jar</string> <string>WEB-INF/lib/dwr-2.0.rc2.jar</string> <string>WEB-INF/lib/jmock-1.0.1.jar</string> + <string>WEB-INF/lib/saaj-api-1.3.jar</string> <string>WEB-INF/lib/cql-java-1.0.jar</string> + <string>WEB-INF/lib/treebase-core-1.0-SNAPSHOT.jar</string> </pathsSet> </path-set> </entry> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |