Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 37504 invoked from network); 10 Mar 2006 17:18:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Mar 2006 17:18:35 -0000 Received: (qmail 70133 invoked by uid 500); 10 Mar 2006 17:18:34 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 70113 invoked by uid 500); 10 Mar 2006 17:18:34 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 70102 invoked by uid 99); 10 Mar 2006 17:18:34 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Mar 2006 09:18:34 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 10 Mar 2006 09:18:33 -0800 Received: (qmail 36965 invoked by uid 65534); 10 Mar 2006 17:18:02 -0000 Message-ID: <20060310171800.36944.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r384855 - in /maven/continuum/branches/continuum-1.0.x/continuum-web/src/main: java/org/apache/maven/continuum/web/servlet/ java/org/apache/maven/continuum/web/tool/ resources/templates/screens/ Date: Fri, 10 Mar 2006 17:17:52 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Fri Mar 10 09:17:42 2006 New Revision: 384855 URL: http://svn.apache.org/viewcvs?rev=384855&view=rev Log: Refactor working copy. All files are now open in a new window with browse/tunnel servlet. Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/servlet/DownloadServlet.java maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/WorkingCopyContentGenerator.java maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/servlet/DownloadServlet.java URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/servlet/DownloadServlet.java?rev=384855&r1=384854&r2=384855&view=diff ============================================================================== --- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/servlet/DownloadServlet.java (original) +++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/servlet/DownloadServlet.java Fri Mar 10 09:17:42 2006 @@ -337,7 +337,7 @@ } else { - return htmlContent.substring( 0, endA + 1 ) + + return htmlContent.substring( 0, endA ) + rewriteHrefInHtml( req, tagName, htmlContent.substring( endA ), fileNameParam ); } } Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/WorkingCopyContentGenerator.java URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/WorkingCopyContentGenerator.java?rev=384855&r1=384854&r2=384855&view=diff ============================================================================== --- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/WorkingCopyContentGenerator.java (original) +++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/WorkingCopyContentGenerator.java Fri Mar 10 09:17:42 2006 @@ -17,6 +17,8 @@ */ import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.codehaus.plexus.summit.pull.RequestTool; +import org.codehaus.plexus.summit.rundata.RunData; import org.codehaus.plexus.util.StringUtils; import java.io.File; @@ -29,7 +31,10 @@ */ public class WorkingCopyContentGenerator extends AbstractLogEnabled + implements RequestTool { + private RunData data; + private File basedir; public String generate( Object item, String baseUrl, File basedir ) @@ -40,7 +45,7 @@ StringBuffer buf = new StringBuffer(); - buf.append( "+ /
" ); + buf.append( "+ /
" ); print( directoryEntries, "  ", baseUrl, buf ); @@ -56,19 +61,22 @@ print( obj, indent, baseUrl, buf ); } } + private void print( Object obj, String indent, String baseUrl, StringBuffer buf ) { if ( obj instanceof File ) { - File f = (File) obj;; + File f = (File) obj; + ; if ( !f.isDirectory() ) { String fileName = f.getName(); - if ( !".cvsignore".equals( fileName ) && !"vssver.scc".equals( fileName ) && !".DS_Store".equals( fileName ) ) + if ( !".cvsignore".equals( fileName ) && !"vssver.scc".equals( fileName ) && + !".DS_Store".equals( fileName ) ) { - String userDirectory = null; + String userDirectory; if ( f.getParentFile().getAbsolutePath().equals( basedir.getAbsolutePath() ) ) { @@ -76,25 +84,30 @@ } else { - userDirectory = f.getParentFile().getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 ); + userDirectory = + f.getParentFile().getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 ); } userDirectory = StringUtils.replace( userDirectory, "\\", "/" ); - buf.append( indent + "   " + fileName + "
" ); + buf.append( indent ).append( "   " + fileName + "
" ); } } else { String directoryName = f.getName(); - if ( !"CVS".equals( directoryName ) && !".svn".equals( directoryName ) && !"SCCS".equals( directoryName ) ) + if ( !"CVS".equals( directoryName ) && !".svn".equals( directoryName ) && + !"SCCS".equals( directoryName ) && !".bzr".equals( directoryName ) ) { String userDirectory = f.getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 ); userDirectory = StringUtils.replace( userDirectory, "\\", "/" ); - buf.append( indent + "+ " + directoryName + "
" ); + buf.append( indent ).append( "+ " ).append( directoryName ).append( + "
" ); } } } @@ -102,5 +115,38 @@ { print( (List) obj, indent + "  ", baseUrl, buf ); } + } + + private String getBrowseServletPath() + { + return data.getContextPath() + "/servlet/browse?file="; + } + + private String getFileUrl( String directory, String fileName ) + { + String dir = directory; + + String filePath; + + if ( StringUtils.isEmpty( dir ) || "/".equals( dir ) ) + { + filePath = basedir.getName() + "/" + fileName; + } + else + { + filePath = basedir.getName() + "/" + directory + "/" + fileName; + } + + return getBrowseServletPath() + filePath; + } + + public void setRunData( RunData data ) + { + this.data = data; + } + + public void refresh() + { + // empty } } Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm?rev=384855&r1=384854&r2=384855&view=diff ============================================================================== --- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm (original) +++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/templates/screens/WorkingCopy.vm Fri Mar 10 09:17:42 2006 @@ -25,12 +25,4 @@ #set ( $files = $continuum.getFiles( $project.id, $data.getParameters().getString( "userDirectory" ) ) ) #set ( $baseUrl = $link.setPage('WorkingCopy.vm').addPathInfo('view', "WorkingCopy").addPathInfo('id', $project.id) ) $workingCopy.generate( $files, $baseUrl.toString(), $continuum.getWorkingDirectory( $project.id ) ) - - #if ( $data.getParameters().getString( "file" ) ) - #set( $filename = $data.getParameters().getString( "file" ) ) -
-
- -
- #end