Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1007 - in trunk/forge/portal-extensions/forge-wiki: . docs lib src/etc src/etc/org/jboss/wiki src/java/org/jboss/wiki src/java/org/jboss/wiki/management src/java/org/jboss/wiki/plugins src/web/WEB-INF/jsp src/web/WEB-INF/tld
|
From: <jbo...@li...> - 2005-08-29 21:35:29
|
Author: szimano Date: 2005-08-29 17:30:05 -0400 (Mon, 29 Aug 2005) New Revision: 1007 Added: trunk/forge/portal-extensions/forge-wiki/docs/wiki-reversed.zuml trunk/forge/portal-extensions/forge-wiki/lib/ trunk/forge/portal-extensions/forge-wiki/lib/cglib2.jar trunk/forge/portal-extensions/forge-wiki/lib/commons-beanutils.jar trunk/forge/portal-extensions/forge-wiki/lib/commons-collections.jar trunk/forge/portal-extensions/forge-wiki/lib/commons-lang.jar trunk/forge/portal-extensions/forge-wiki/lib/commons-logging.jar trunk/forge/portal-extensions/forge-wiki/lib/dom4j.jar trunk/forge/portal-extensions/forge-wiki/lib/ehcache.jar trunk/forge/portal-extensions/forge-wiki/lib/hibernate2.jar trunk/forge/portal-extensions/forge-wiki/lib/hsqldb.jar trunk/forge/portal-extensions/forge-wiki/lib/informa.jar trunk/forge/portal-extensions/forge-wiki/lib/jdbc2_0-stdext.jar trunk/forge/portal-extensions/forge-wiki/lib/jdom.jar trunk/forge/portal-extensions/forge-wiki/lib/jta.jar trunk/forge/portal-extensions/forge-wiki/lib/log4j-1.2.8.jar trunk/forge/portal-extensions/forge-wiki/lib/lucene.jar trunk/forge/portal-extensions/forge-wiki/lib/odmg.jar trunk/forge/portal-extensions/forge-wiki/lib/xalan.jar trunk/forge/portal-extensions/forge-wiki/lib/xml-apis.jar trunk/forge/portal-extensions/forge-wiki/src/etc/application.xml trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiCommon.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/RSSPlugin.java Modified: trunk/forge/portal-extensions/forge-wiki/maven.xml trunk/forge/portal-extensions/forge-wiki/project.properties trunk/forge/portal-extensions/forge-wiki/project.xml trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld Log: ejb3 service, borders, rss etc. Added: trunk/forge/portal-extensions/forge-wiki/docs/wiki-reversed.zuml =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/docs/wiki-reversed.zuml ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/cglib2.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/cglib2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/commons-beanutils.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/commons-beanutils.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/commons-collections.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/commons-collections.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/commons-lang.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/commons-lang.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/commons-logging.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/commons-logging.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/dom4j.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/dom4j.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/ehcache.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/ehcache.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/hibernate2.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/hibernate2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/hsqldb.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/hsqldb.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/informa.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/informa.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/jdbc2_0-stdext.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/jdbc2_0-stdext.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/jdom.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/jdom.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/jta.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/jta.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/log4j-1.2.8.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/log4j-1.2.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/lucene.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/lucene.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/odmg.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/odmg.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/xalan.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/xalan.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/lib/xml-apis.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/lib/xml-apis.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/forge/portal-extensions/forge-wiki/maven.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-29 21:30:05 UTC (rev 1007) @@ -3,8 +3,9 @@ Distributable under LGPL license. See terms of license at gnu.org. --> -<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> +<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" > <goal name="build"> + <attainGoal name="copy-tld" /> <ant:copy todir="target/classes/org/jboss/wiki" flatten="true"> <ant:fileset dir="src/java/org/jboss/wiki"> @@ -14,16 +15,38 @@ <ant:filename name="*.xml" /> </ant:fileset> </ant:copy> + <ant:copy todir="target/wiki/WEB-INF/lib" flatten="true"> + <ant:fileset dir="lib"> + <ant:filename name="*.jar" /> + </ant:fileset> + </ant:copy> <attainGoal name="war" /> + <attainGoal name="ejb" /> + <ant:copy todir="target/ejb3/" flatten="true"> + <ant:fileset dir="target"> + <ant:filename name="*.jar" /> + </ant:fileset> + </ant:copy> + <attainGoal name="jar" /> + </goal> <goal name="deploy"> - <ant:copy todir="${local.deploy.dir}" flatten="true"> + <ant:copy + tofile="${local.deploy.dir}/wiki.ear/META-INF/application.xml" + file="src/etc/application.xml" /> + <!--<ant:copy + tofile="${local.deploy.dir}/wiki.ear/wiki-common.jar" + file="target/wiki-1.0.jar" />--> + <ant:copy todir="${local.deploy.dir}/wiki.ear" flatten="true"> <ant:fileset dir="."> <ant:filename name="target/*.war" /> </ant:fileset> </ant:copy> + <ant:copy + tofile="${local.deploy.dir}/wiki.ear/wiki.ejb3" + file="target/ejb3/wiki-1.0.jar" /> </goal> <goal name="all"> Modified: trunk/forge/portal-extensions/forge-wiki/project.properties =================================================================== --- trunk/forge/portal-extensions/forge-wiki/project.properties 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/project.properties 2005-08-29 21:30:05 UTC (rev 1007) @@ -1,3 +1,6 @@ maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/ maven.junit.fork=yes maven.war.src=${basedir}/src/web +maven.jar.includes=**/WikiEngine.class +maven.ejb.includes=**/WikiService* + Modified: trunk/forge/portal-extensions/forge-wiki/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-29 21:30:05 UTC (rev 1007) @@ -83,5 +83,36 @@ <jar>commons-fileupload-1.0.jar</jar> </dependency> + <dependency> + <groupId>informa</groupId> + <artifactId>informa</artifactId> + <version>0.6.0</version> + </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6</version> + </dependency> + + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3x</artifactId> + <version>1.0</version> + <jar>jboss-ejb3x.jar</jar> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3</artifactId> + <version>1.0</version> + <jar>jboss-ejb3.jar</jar> + </dependency> </dependencies> </project> Added: trunk/forge/portal-extensions/forge-wiki/src/etc/application.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/etc/application.xml 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/etc/application.xml 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,11 @@ +<application> + <display-name>JBoss Labs - forge infrastructure</display-name> + <!--<module> + <ejb>wiki.ejb3</ejb> + </module>--> + <module> + <web> + <web-uri>wiki.war</web-uri> + </web> + </module> +</application> Modified: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-29 21:30:05 UTC (rev 1007) @@ -49,4 +49,12 @@ <class>org.jboss.wiki.plugins.HTMLTranslator</class> </plugin> </wikiType> + <wikiType> + <name>RSS</name> + <class>org.jboss.wiki.plugins.DefaultWikiType</class> + <plugin> + <name>RSSPlugin</name> + <class>org.jboss.wiki.plugins.RSSPlugin</class> + </plugin> + </wikiType> </wikiTypes> \ No newline at end of file Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiCommon.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiCommon.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiCommon.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,28 @@ +package org.jboss.wiki; + +import javax.management.MalformedObjectNameException; + +import org.jboss.mx.util.MBeanProxyExt; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.wiki.management.WikiServiceMenagement; + +public class WikiCommon { + + public static final String WIKI_SERVICE_NAME = "wiki:service=wikiService"; + + private WikiServiceMenagement wikiServiceMenagement; + + public WikiServiceMenagement getWikiManagement() { + try { + if (wikiServiceMenagement == null) + wikiServiceMenagement = (WikiServiceMenagement) MBeanProxyExt.create( + WikiServiceMenagement.class, + WIKI_SERVICE_NAME, + MBeanServerLocator.locate()); + + return wikiServiceMenagement; + } catch (MalformedObjectNameException e) { + throw new RuntimeException(e); + } + } +} Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -18,6 +18,7 @@ import javax.portlet.*; import org.jboss.portlet.*; +import org.jboss.wiki.management.WikiServiceMenagement; import org.apache.commons.fileupload.PortletDiskFileUpload; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.FileItem; @@ -41,6 +42,12 @@ public void init() { wikiEngine = new WikiEngine(); + + //WikiCommon wikiCommon = new WikiCommon(); + + //WikiServiceMenagement wikiServiceMenagement = wikiCommon.getWikiManagement(); + + //wikiServiceMenagement.setWikiEngine(wikiEngine); } public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) { Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -88,7 +88,7 @@ // execute the plugins for (int i = 0; i < plugins.size(); i++) { - //System.out.println("Executing plugin: "+plugins.get(i).getName()); + System.out.println("Executing plugin: "+plugins.get(i).getName()); newPage = (plugins.get(i)).process(newPage, wikiSession); } Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiService.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,40 @@ +package org.jboss.wiki.management; + +import javax.ejb.Local; +import javax.ejb.Remote; +import org.jboss.annotation.ejb.Service; +import org.jboss.wiki.WikiCommon; +import org.jboss.wiki.WikiEngine; + +@Service (objectName = WikiCommon.WIKI_SERVICE_NAME) +@Local(WikiServiceLocal.class) +@Remote(WikiServiceRemote.class) +public class WikiService implements WikiServiceLocal, WikiServiceRemote, WikiServiceMenagement { + WikiEngine wikiEngine; + + public WikiEngine getWikiEngine() { + return wikiEngine; + } + + public void setWikiEngine(WikiEngine wikiEngine) { + this.wikiEngine = wikiEngine; + } + + public void create() throws Exception { + System.out.println("WikiService - Creating"); + } + + public void start() throws Exception { + System.out.println("WikiService - Starting"); + } + + public void stop() { + System.out.println("WikiService - Stoping"); + } + + public void destroy() { + System.out.println("WikiService - Destroying"); + } + + +} Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceLocal.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,9 @@ +package org.jboss.wiki.management; + +import org.jboss.wiki.WikiEngine; + +public interface WikiServiceLocal { + public WikiEngine getWikiEngine(); + + public void setWikiEngine(WikiEngine wikiEngine); +} Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceMenagement.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,27 @@ +/* + * JBoss, the OpenSource EJB server + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package org.jboss.wiki.management; + +import org.jboss.annotation.ejb.Management; +import org.jboss.wiki.WikiEngine; + +@Management +public interface WikiServiceMenagement { + + public WikiEngine getWikiEngine(); + + public void setWikiEngine(WikiEngine wikiEngine); + + void create() throws Exception; + + void start() throws Exception; + + void stop(); + + void destroy(); + +} Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/management/WikiServiceRemote.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,5 @@ +package org.jboss.wiki.management; + +public interface WikiServiceRemote { + +} Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/RSSPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/RSSPlugin.java 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/RSSPlugin.java 2005-08-29 21:30:05 UTC (rev 1007) @@ -0,0 +1,65 @@ +package org.jboss.wiki.plugins; + +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.net.MalformedURLException; +import java.net.URL; + +import org.jboss.wiki.WikiPage; + +import de.nava.informa.core.ChannelExporterIF; +import de.nava.informa.core.ChannelIF; +import de.nava.informa.core.ItemIF; +import de.nava.informa.exporters.RSS_2_0_Exporter; +import de.nava.informa.impl.basic.ChannelBuilder; +import org.jboss.wiki.WikiPlugin; +import org.jboss.wiki.WikiSession; + +public class RSSPlugin extends WikiPlugin { + + @Override + public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) { + + String chanName = wikiPage.getName()+" change feed"; + Writer writer = new StringWriter(); + + ChannelBuilder builder = new ChannelBuilder(); + + ChannelIF channel = builder.createChannel(chanName); + channel.setDescription("Test Channel: " + chanName); + try { + ItemIF item1 = builder.createItem(channel, "Item 1 for " + chanName, + "First in line", new URL("http://sf.net/rss2_projnews.php?group_id=52620")); + ItemIF item2 = builder.createItem(channel, "Item 2 for " + chanName, + "Second in line", new URL("http://sf.net/export/rss2_projfiles.php?group_id=52620")); + + channel.addItem(item1); channel.addItem(item2); + + } + catch (MalformedURLException e) { + System.err.println(e); + } + + try { + ChannelExporterIF exporter = new RSS_2_0_Exporter(writer, "utf8"); +// assuming you have a ChannelIF object available as channel + exporter.write(channel); + } + catch (IOException e) { + System.err.println(e); + } + + wikiPage.setPageContent(((StringWriter)writer).toString()+wikiPage.getContent()); + + return wikiPage; + } + + @Override + public void init() { + // TODO Auto-generated method stub + + } + +} Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-29 21:30:05 UTC (rev 1007) @@ -34,7 +34,7 @@ <table style="width: 100%" border="0"> <tr style="vertical-align: bottom;"> <td style="vertical-align: bottom; align-bottom: 0px;"> -<div><a href="<%=friendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" border=\"0\"/></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div> +<div><a href="<%=friendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" border="0"/></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div> </td> <td style="text-align: right;vertical-align: bottom; align-bottom: 0px;"> Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld 2005-08-29 20:35:56 UTC (rev 1006) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld 2005-08-29 21:30:05 UTC (rev 1007) @@ -9,17 +9,20 @@ --> <tlib-version>1.1</tlib-version> <jsp-version>2.0</jsp-version> - <shortname>forge</shortname> - <info>Forge tags</info> + <shortname>wiki</shortname> + <info>JBoss Wiki tags</info> <tag> <name>wikiEditLink</name> - <tagclass>org.jboss.wiki.taglib.wikiEditLinkTag</tagclass> + <tagclass>org.jboss.wiki.taglib.WikiEditLinkTag</tagclass> <attribute> + <name>actionURL</name> + <required>true</required> + </attribute> + <attribute> <name>page</name> <required>true</required> - <rtexprvalue>true</rtexprvalue> - </attribute>s + </attribute> </tag> </taglib> |