Author: kcardineaud Date: 2011-07-07 17:01:43 +0200 (Thu, 07 Jul 2011) New Revision: 166 Url: http://nuiton.org/repositories/revision/scmwebeditor/166 Log: ScmWebEditor can now be use with svn protocol repository Added: trunk/src/main/java/org/nuiton/scmwebeditor/ApplicationListener.java Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java trunk/src/main/webapp/WEB-INF/web.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-07 14:00:26 UTC (rev 165) +++ trunk/pom.xml 2011-07-07 15:01:43 UTC (rev 166) @@ -44,7 +44,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.3.2-1</version> + <version>1.3.5</version> </dependency> <dependency> Added: trunk/src/main/java/org/nuiton/scmwebeditor/ApplicationListener.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ApplicationListener.java (rev 0) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ApplicationListener.java 2011-07-07 15:01:43 UTC (rev 166) @@ -0,0 +1,24 @@ +package org.nuiton.scmwebeditor; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; +import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl; + +public class ApplicationListener implements ServletContextListener { + + @Override + public void contextInitialized(ServletContextEvent sce) { + SVNRepositoryFactoryImpl.setup(); + DAVRepositoryFactory.setup(); + + } + + @Override + public void contextDestroyed(ServletContextEvent sce) { + // Nothing + + } + +} Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-07 14:00:26 UTC (rev 165) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-07-07 15:01:43 UTC (rev 166) @@ -23,6 +23,7 @@ import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; +import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl; import org.tmatesoft.svn.core.io.SVNRepository; import org.tmatesoft.svn.core.io.SVNRepositoryFactory; @@ -164,6 +165,9 @@ if(id.equals("")) { try { + log.info("Address svn : "+address); + + repository = SVNRepositoryFactory.create( SVNURL.parseURIDecoded( address ) ); authManager = SVNWCUtil.createDefaultAuthenticationManager( name , password ); repository.setAuthenticationManager( authManager ); @@ -177,7 +181,7 @@ return "authError"; } catch (SVNException e) { if(log.isErrorEnabled()) { - log.error("Can't access to the repository"); + log.error("Can't access to the repository",e); } error="Can't access to the repository"; } Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2011-07-07 14:00:26 UTC (rev 165) +++ trunk/src/main/webapp/WEB-INF/web.xml 2011-07-07 15:01:43 UTC (rev 166) @@ -18,52 +18,9 @@ <welcome-file>index.jsp</welcome-file> </welcome-file-list> - <!-- - <servlet> - <servlet-name>ScmWebEditorMainServlet</servlet-name> - <servlet-class>org.nuiton.scmwebeditor.ScmWebEditorMainServlet</servlet-class> - </servlet> - <servlet> - <servlet-name>PreviewServlet</servlet-name> - <servlet-class>org.nuiton.scmwebeditor.PreviewServlet</servlet-class> - </servlet> - <servlet> - <servlet-name>PrivateSvnServlet</servlet-name> - <servlet-class>org.nuiton.scmwebeditor.PrivateSvnServlet</servlet-class> - </servlet> - --> + <listener> + <description>Init</description> + <listener-class>org.nuiton.scmwebeditor.ApplicationListener</listener-class> + </listener> -<!-- <servlet>--> -<!-- <servlet-name>PictureUpload</servlet-name>--> -<!-- <servlet-class>org.nuiton.scmwebeditor.PictureUpload</servlet-class>--> -<!-- </servlet>--> -<!-- - <servlet> - <servlet-name>SearchServlet</servlet-name> - <servlet-class>org.nuiton.scmwebeditor.SearchServlet</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>ScmWebEditorMainServlet</servlet-name> - <url-pattern>/scmwebeditor</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>PreviewServlet</servlet-name> - <url-pattern>/previewservlet</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>PrivateSvnServlet</servlet-name> - <url-pattern>/privatesvnservlet</url-pattern> - </servlet-mapping> ---> -<!-- <servlet-mapping>--> -<!-- <servlet-name>PictureUpload</servlet-name>--> -<!-- <url-pattern>/pictureUpload</url-pattern>--> -<!-- </servlet-mapping>--> -<!-- - <servlet-mapping> - <servlet-name>SearchServlet</servlet-name> - <url-pattern>/searchservlet</url-pattern> - </servlet-mapping> - --> - </web-app>