Author: joakime Date: Wed Nov 7 09:46:01 2007 New Revision: 592825 URL: http://svn.apache.org/viewvc?rev=592825&view=rev Log: Fixing copy/paste missing content (distribution management/repository/url) Fixing copy/paste content formatting.
Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippet.java maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/taglib.tld maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippet.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippet.java?rev=592825&r1=592824&r2=592825&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippet.java (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippet.java Wed Nov 7 09:46:01 2007 @@ -39,10 +39,16 @@ public class CopyPasteSnippet extends AbstractLogEnabled { - public void write( Object o, PageContext pageContext ) + public static final String PRE = "pre"; + + public static final String TOGGLE = "toggle"; + + public void write( String wrapper, Object o, PageContext pageContext ) throws JspException { + StringBuffer prefix = new StringBuffer(); StringBuffer buf = new StringBuffer(); + StringBuffer suffix = new StringBuffer(); if ( o == null ) { @@ -51,7 +57,24 @@ } else if ( o instanceof ManagedRepositoryConfiguration ) { - createSnippet( buf, (ManagedRepositoryConfiguration) o, pageContext ); + ManagedRepositoryConfiguration repo = (ManagedRepositoryConfiguration) o; + + if ( TOGGLE.equals( wrapper ) ) + { + prefix.append( "<a href=\"#\" onclick=\"Effect.toggle('repoPom" ); + prefix.append( repo.getId() ).append( "','slide'); return false;\">Show POM Snippet</a><br/>" ); + prefix.append( "<pre class=\"pom\" style=\"display: none;\" id=\"repoPom" ).append( repo.getId() ); + prefix.append( "\"><code>" ); + + suffix.append( "</code></pre>" ); + } + else if ( PRE.equals( wrapper ) ) + { + prefix.append( "<pre>" ); + suffix.append( "</pre>" ); + } + + createSnippet( buf, repo, pageContext ); } else { @@ -61,7 +84,11 @@ try { JspWriter out = pageContext.getOut(); + + out.write( prefix.toString() ); out.write( StringEscapeUtils.escapeXml( buf.toString() ) ); + out.write( suffix.toString() ); + out.flush(); } catch ( IOException e ) @@ -84,6 +111,8 @@ snippet.append( " <" ).append( distRepoName ).append( ">\n" ); snippet.append( " <id>" ).append( repo.getId() ).append( "</id>\n" ); + snippet.append( " <url>dav:" ).append( ContextUtils.getBaseURL( pageContext, "repository" ) ); + snippet.append( "/" ).append( repo.getId() ).append( "/" ).append( "</url>\n" ); if ( !"default".equals( repo.getLayout() ) ) { Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java?rev=592825&r1=592824&r2=592825&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/CopyPasteSnippetTag.java Wed Nov 7 09:46:01 2007 @@ -34,6 +34,8 @@ extends TagSupport { private Object object; + + private String wrapper = CopyPasteSnippet.PRE; public void release() { @@ -59,7 +61,7 @@ throw new JspException( "Unable to process snippet. Component not found." ); } - snippet.write( object, pageContext ); + snippet.write( wrapper, object, pageContext ); return super.doEndTag(); } @@ -67,5 +69,10 @@ public void setObject( Object object ) { this.object = object; + } + + public void setWrapper( String wrapper ) + { + this.wrapper = wrapper; } } Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/taglib.tld URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/taglib.tld?rev=592825&r1=592824&r2=592825&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/taglib.tld (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/taglib.tld Wed Nov 7 09:46:01 2007 @@ -93,6 +93,13 @@ <description><![CDATA[The Object to Render]]></description> </attribute> + <attribute> + <name>wrapper</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + + <description><![CDATA[The wrapper type to use, can be 'pre' or 'toggle']]></description> + </attribute> </tag> <tag> Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp?rev=592825&r1=592824&r2=592825&view=diff ============================================================================== --- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp Wed Nov 7 09:46:01 2007 @@ -214,10 +214,8 @@ </c:if> <tr> <th>POM Snippet</th> - <td><a href="#" onclick="Effect.toggle('repoPom${repository.id}','slide'); return false;">Show POM Snippet</a><br/> - <pre class="pom" style="display: none;" id="repoPom${repository.id}"><code> - <archiva:copy-paste-snippet object="${repository}"/> - </code></pre> + <td> + <archiva:copy-paste-snippet object="${repository}" wrapper="toggle" /> </td> </tr> </table>