Menu
▾
▴
jboss-svn-commits — JBoss SVN commit notifications
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(233) |
Sep
(199) |
Oct
(206) |
Nov
(185) |
Dec
(270) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(232) |
Feb
(426) |
Mar
(623) |
Apr
(592) |
May
(506) |
Jun
(389) |
Jul
(160) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
| 2007 |
Jan
(1) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(9) |
Nov
(6) |
Dec
(6) |
| 2008 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(5) |
Jul
(10) |
Aug
(2) |
Sep
(12) |
Oct
(10) |
Nov
(54) |
Dec
(49) |
| 2009 |
Jan
(19) |
Feb
(13) |
Mar
(20) |
Apr
(24) |
May
(44) |
Jun
(29) |
Jul
(32) |
Aug
(10) |
Sep
(7) |
Oct
(10) |
Nov
(4) |
Dec
(17) |
| 2010 |
Jan
(14) |
Feb
(5) |
Mar
(23) |
Apr
(50) |
May
(31) |
Jun
(9) |
Jul
(5) |
Aug
(4) |
Sep
(7) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(12) |
Feb
(5) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jbo...@li...> - 2005-08-12 22:45:50
|
Author: dam...@jb...
Date: 2005-08-12 18:44:24 -0400 (Fri, 12 Aug 2005)
New Revision: 841
Added:
trunk/forge/portal-extensions/forge-wiki/data/
Removed:
trunk/forge/portal-extensions/forge-wiki/src/test/data/
Modified:
trunk/forge/portal-extensions/forge-wiki/project.xml
Log:
Added unit test elements and data.
Copied: trunk/forge/portal-extensions/forge-wiki/data (from rev 839, trunk/forge/portal-extensions/forge-wiki/src/test/data)
Modified: trunk/forge/portal-extensions/forge-wiki/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-12 22:06:13 UTC (rev 840)
+++ trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-12 22:44:24 UTC (rev 841)
@@ -10,6 +10,15 @@
<id>wiki-portlet</id>
<name>Wiki portlet</name>
<currentVersion>1.0</currentVersion>
+ <build>
+ <unitTestSourceDirectory>./src/test/java</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/Test*.java</include>
+ </includes>
+ </unitTest>
+ </build>
<organization>
<name>Tomasz Szymanski</name>
<url>http://mamut.net.pl</url>
|
|
From: <jbo...@li...> - 2005-08-12 22:07:33
|
Author: dam...@jb...
Date: 2005-08-12 18:06:13 -0400 (Fri, 12 Aug 2005)
New Revision: 840
Added:
trunk/forge/portal-extensions/forge-wiki/src/test/java/
trunk/forge/portal-extensions/forge-wiki/src/test/java/org/
trunk/forge/portal-extensions/forge-wiki/src/test/java/org/jboss/
trunk/forge/portal-extensions/forge-wiki/src/test/java/org/jboss/wiki/
trunk/forge/portal-extensions/forge-wiki/src/test/java/org/jboss/wiki/test/
trunk/forge/portal-extensions/forge-wiki/src/test/java/org/jboss/wiki/test/HTMLTranslatorTest.java
Removed:
trunk/forge/portal-extensions/forge-wiki/src/test/HTMLTranslatorTest.java
Log:
Moved the tests around.
Deleted: trunk/forge/portal-extensions/forge-wiki/src/test/HTMLTranslatorTest.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/test/HTMLTranslatorTest.java 2005-08-12 21:34:22 UTC (rev 839)
+++ trunk/forge/portal-extensions/forge-wiki/src/test/HTMLTranslatorTest.java 2005-08-12 22:06:13 UTC (rev 840)
@@ -1,67 +0,0 @@
-
-import java.io.BufferedReader;
-import java.io.File;
-
-
-import java.io.FileReader;
-
-import java.io.IOException;
-
-
-import org.jboss.wiki.plugins.HTMLTranslator;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-/*
- * Created on Aug 12, 2005
- *
- *
- */
-
-/**
- * @author rali
- *
- *
- */
-public class HTMLTranslatorTest extends TestCase {
-
- public HTMLTranslatorTest(String str) {
- super(str);
- }
-
- public void testParseLinks(){
- FileReader fin = null;
- HTMLTranslator tr = new HTMLTranslator();
- File dir = new File("data");
-
-
- // The list of files can also be retrieved as File objects
- File[] files = dir.listFiles();
-
-
-
- try {
- for(int i=0; i<files.length;i++)
- { fin = new FileReader(files[i]);
- final BufferedReader in = new BufferedReader(fin);
- int line; StringBuffer text = new StringBuffer();
- String parsed = "";
-
- while((line=in.read())!=-1){
- text.append((char)line);}
- // System.out.println(text.toString());
-
- parsed = tr.parseLinks(text.toString(), "");
- // System.out.println(parsed);
-
- }}
-
-
-
- catch (IOException e) {
- e.printStackTrace();
- Assert.assertTrue(true);}
-
-}
-}
Copied: trunk/forge/portal-extensions/forge-wiki/src/test/java/org/jboss/wiki/test/HTMLTranslatorTest.java (from rev 839, trunk/forge/portal-extensions/forge-wiki/src/test/HTMLTranslatorTest.java)
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/test/HTMLTranslatorTest.java 2005-08-12 21:34:22 UTC (rev 839)
+++ trunk/forge/portal-extensions/forge-wiki/src/test/java/org/jboss/wiki/test/HTMLTranslatorTest.java 2005-08-12 22:06:13 UTC (rev 840)
@@ -0,0 +1,62 @@
+package org.jboss.wiki.test;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import org.jboss.wiki.plugins.HTMLTranslator;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+/*
+ * Created on Aug 12, 2005
+ *
+ *
+ */
+
+/**
+ * @author rali
+ *
+ *
+ */
+public class HTMLTranslatorTest extends TestCase {
+
+ public HTMLTranslatorTest(String str) {
+ super(str);
+ }
+
+ public void testParseLinks(){
+ FileReader fin = null;
+ HTMLTranslator tr = new HTMLTranslator();
+ File dir = new File("data");
+
+
+ // The list of files can also be retrieved as File objects
+ File[] files = dir.listFiles();
+
+
+
+ try {
+ for(int i=0; i<files.length;i++)
+ { fin = new FileReader(files[i]);
+ final BufferedReader in = new BufferedReader(fin);
+ int line; StringBuffer text = new StringBuffer();
+ String parsed = "";
+
+ while((line=in.read())!=-1){
+ text.append((char)line);}
+ // System.out.println(text.toString());
+
+ parsed = tr.parseLinks(text.toString(), "");
+ // System.out.println(parsed);
+
+ }}
+
+
+
+ catch (IOException e) {
+ e.printStackTrace();
+ Assert.assertTrue(true);}
+
+}
+}
|
|
From: <jbo...@li...> - 2005-08-12 21:35:40
|
Author: ral...@jb...
Date: 2005-08-12 17:34:22 -0400 (Fri, 12 Aug 2005)
New Revision: 839
Added:
trunk/forge/portal-extensions/forge-wiki/src/test/HTMLTranslatorTest.java
Log:
testsuite for the link parse method
Added: trunk/forge/portal-extensions/forge-wiki/src/test/HTMLTranslatorTest.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/test/HTMLTranslatorTest.java 2005-08-12 20:12:55 UTC (rev 838)
+++ trunk/forge/portal-extensions/forge-wiki/src/test/HTMLTranslatorTest.java 2005-08-12 21:34:22 UTC (rev 839)
@@ -0,0 +1,67 @@
+
+import java.io.BufferedReader;
+import java.io.File;
+
+
+import java.io.FileReader;
+
+import java.io.IOException;
+
+
+import org.jboss.wiki.plugins.HTMLTranslator;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+/*
+ * Created on Aug 12, 2005
+ *
+ *
+ */
+
+/**
+ * @author rali
+ *
+ *
+ */
+public class HTMLTranslatorTest extends TestCase {
+
+ public HTMLTranslatorTest(String str) {
+ super(str);
+ }
+
+ public void testParseLinks(){
+ FileReader fin = null;
+ HTMLTranslator tr = new HTMLTranslator();
+ File dir = new File("data");
+
+
+ // The list of files can also be retrieved as File objects
+ File[] files = dir.listFiles();
+
+
+
+ try {
+ for(int i=0; i<files.length;i++)
+ { fin = new FileReader(files[i]);
+ final BufferedReader in = new BufferedReader(fin);
+ int line; StringBuffer text = new StringBuffer();
+ String parsed = "";
+
+ while((line=in.read())!=-1){
+ text.append((char)line);}
+ // System.out.println(text.toString());
+
+ parsed = tr.parseLinks(text.toString(), "");
+ // System.out.println(parsed);
+
+ }}
+
+
+
+ catch (IOException e) {
+ e.printStackTrace();
+ Assert.assertTrue(true);}
+
+}
+}
|
|
From: <jbo...@li...> - 2005-08-12 19:44:19
|
Author: ral...@jb...
Date: 2005-08-12 15:42:55 -0400 (Fri, 12 Aug 2005)
New Revision: 837
Modified:
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
Log:
didnt quite work
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-12 19:24:46 UTC (rev 836)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-12 19:42:55 UTC (rev 837)
@@ -50,8 +50,8 @@
public String parseLinks(String text, String actionURL) {
String translatedContent = text;
String link;// = "";
- String href1regex = "\\[[\\p{Graph}\\p{Blank}&&[^\\[\\]]]+\\|[[\\p{Alnum}\\/\\/\\,\\.\\|\\:\\;\\+\\=\\&]\\p{Blank}]+\\]";//"^(\\[\\p{Alnum}&&\\|&&\\p{Alnum}&&\\])$";
- String href2regex = "\\[\\p{Graph}+\\]";
+ String href1regex = "\\[.+\\|.+\\]";
+ String href2regex = "\\[.+\\]";
Pattern tLinks = Pattern.compile(href1regex);
Pattern links = Pattern.compile(href2regex);
Matcher textlinks = tLinks.matcher(text);
|
|
From: <jbo...@li...> - 2005-08-12 19:26:07
|
Author: ral...@jb...
Date: 2005-08-12 15:24:46 -0400 (Fri, 12 Aug 2005)
New Revision: 836
Modified:
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
Log:
updated regex for links
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-12 15:01:58 UTC (rev 835)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-12 19:24:46 UTC (rev 836)
@@ -50,8 +50,8 @@
public String parseLinks(String text, String actionURL) {
String translatedContent = text;
String link;// = "";
- String href1regex = "\\[.+\\|.+\\]";
- String href2regex = "\\[.+\\]";
+ String href1regex = "\\[[\\p{Graph}\\p{Blank}&&[^\\[\\]]]+\\|[[\\p{Alnum}\\/\\/\\,\\.\\|\\:\\;\\+\\=\\&]\\p{Blank}]+\\]";//"^(\\[\\p{Alnum}&&\\|&&\\p{Alnum}&&\\])$";
+ String href2regex = "\\[\\p{Graph}+\\]";
Pattern tLinks = Pattern.compile(href1regex);
Pattern links = Pattern.compile(href2regex);
Matcher textlinks = tLinks.matcher(text);
|
Author: adamw Date: 2005-08-12 11:01:58 -0400 (Fri, 12 Aug 2005) New Revision: 835 Added: trunk/forge/portal-extensions/forge-forums/ trunk/forge/portal-extensions/forge-forums/maven.xml trunk/forge/portal-extensions/forge-forums/project.xml trunk/forge/portal-extensions/forge-forums/to-copy/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/MANIFEST.MF trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/application.xml trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/jboss-app.xml trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums-lib.jar trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/MANIFEST.MF trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/jboss-service.xml trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/hibernate.cfg.xml trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/setup.txt trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/CategoryImpl.hbm.xml trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/ForumImpl.hbm.xml trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PollImpl.hbm.xml trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PosterImpl.hbm.xml trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/TopicImpl.hbm.xml trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/WatchImpl.hbm.xml trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.war Removed: trunk/forge/portal-extensions/forge-forums-fix/ trunk/forge/portal-extensions/jboss-forums/ Log: Portal forums w/ forge fixes. Added: trunk/forge/portal-extensions/forge-forums/maven.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/maven.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/maven.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,20 @@ +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> + <goal name="build"> + + </goal> + + <goal name="deploy"> + + </goal> + + <goal name="first-install"> + <ant:copy todir="${local.deploy.dir}" overwrite="no"> + <ant:fileset dir="to-copy" /> + </ant:copy> + </goal> +</project> \ No newline at end of file Added: trunk/forge/portal-extensions/forge-forums/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/project.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/project.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,17 @@ +<?xml version='1.0' encoding='ISO-8859-1'?> +<!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> +<project> + <pomVersion>3</pomVersion> + <id>jbossforums</id> + <name>JBoss Forumsi with forge fixes</name> + <currentVersion>1.0</currentVersion> + <organization> + <name>Jboss team</name> + <url>http://www.jboss.com</url> + </organization> + <description></description> +</project> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/MANIFEST.MF =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/MANIFEST.MF 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/MANIFEST.MF 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Created-By: Apache Ant 1.5.1 + Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/application.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/application.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/application.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application> + <display-name>JBoss Portal Forums</display-name> + <module> + <web> + <web-uri>portal-forums.war</web-uri> +<!-- <context-root>/forums</context-root> --> + </web> + </module> +</application> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/jboss-app.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/jboss-app.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/jboss-app.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-app> + <module> + <service>portal-forums.sar</service> + </module> +</jboss-app> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums-lib.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums-lib.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/MANIFEST.MF =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/MANIFEST.MF 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/MANIFEST.MF 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Created-By: Apache Ant 1.5.1 + Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/jboss-service.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/jboss-service.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/jboss-service.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE server> +<server> + <mbean + code="org.jboss.portal.core.hibernate.SessionFactoryBinder" + name="portal.forums:service=Hibernate" + xmbean-dd="org/jboss/portal/core/hibernate/SessionFactoryBinder.xml"> + <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends> + <attribute name="DoChecking">true</attribute> + <attribute name="ConfigLocation">conf/hibernate/hibernate.cfg.xml</attribute> + <attribute name="SetupLocation">conf/hibernate/setup.txt</attribute> + </mbean> +</server> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/hibernate.cfg.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/hibernate.cfg.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/hibernate.cfg.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,25 @@ +<?xml version='1.0' encoding='utf-8'?> +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> +<hibernate-configuration> + <session-factory + name="java:portal/ForumSessionFactory"> + <property name="connection.datasource">java:PortalDS</property> + <property name="show_sql">false</property> + + <!-- Force the dialect instead of using autodetection --> + <!-- + <property name="dialect">org.hibernate.dialect.HSQLDialect</property> + --> + + <!-- Mapping files --> + <mapping resource="org/jboss/portlet/forums/impl/CategoryImpl.hbm.xml"/> + <mapping resource="org/jboss/portlet/forums/impl/ForumImpl.hbm.xml"/> + <mapping resource="org/jboss/portlet/forums/impl/PollImpl.hbm.xml"/> + <mapping resource="org/jboss/portlet/forums/impl/PosterImpl.hbm.xml"/> + <mapping resource="org/jboss/portlet/forums/impl/PostImpl.hbm.xml"/> + <mapping resource="org/jboss/portlet/forums/impl/TopicImpl.hbm.xml"/> + <mapping resource="org/jboss/portlet/forums/impl/WatchImpl.hbm.xml"/> + </session-factory> +</hibernate-configuration> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/setup.txt =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/setup.txt 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/setup.txt 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,57 @@ +// This bsh script setup the default content of the portal. +// It is called when the SessionFactoryBinder service has created a schema and needs to populate it +import org.jboss.portal.common.util.Tools; +import org.jboss.portlet.forums.impl.CategoryImpl; +import org.jboss.portlet.forums.impl.ForumImpl; + +try +{ + session = SessionFactory.openSession(); + tx = session.beginTransaction(); + + // + CategoryImpl cat = new CategoryImpl(); + cat.setOrder(10); + cat.setTitle("Dummy demo category"); + cat.setForums(new java.util.ArrayList()); + + // + ForumImpl forum1 = new ForumImpl(); + forum1.setDescription("First description"); + forum1.setCategory(cat); + forum1.setLastPost(null); + forum1.setName("First forum"); + forum1.setOrder(10); + forum1.setTopicCount(0); + forum1.setPostCount(0); + forum1.setPruneEnable(true); + forum1.setPruneNext(0); + forum1.setStatus(0); + forum1.setType(0); + ForumImpl forum2 = new ForumImpl(); + forum2.setDescription("Second description"); + forum2.setCategory(cat); + forum2.setLastPost(null); + forum2.setName("Second forum"); + forum2.setOrder(20); + forum2.setTopicCount(0); + forum2.setPostCount(0); + forum2.setPruneEnable(true); + forum2.setPruneNext(0); + forum2.setStatus(0); + forum2.setType(0); + + // + cat.getForums().add(forum1); + cat.getForums().add(forum2); + + // + session.save(cat); + session.save(forum1); + session.save(forum2); + tx.commit(); +} +finally +{ + Tools.safeClose(session); +} Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/CategoryImpl.hbm.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/CategoryImpl.hbm.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/CategoryImpl.hbm.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping +> + <class + name="org.jboss.portlet.forums.impl.CategoryImpl" + table="jbp_forums_categories" + > + + <id + name="ID" + column="jbp_id" + type="java.lang.Integer" + > + <generator class="native"> + <!-- + To add non XDoclet generator parameters, create a file named + hibernate-generator-params-CategoryImpl.xml + containing the additional parameters and place it in your merge dir. + --> + </generator> + </id> + + <bag + name="forums" + lazy="true" + inverse="true" + cascade="all" + > + + <key + column="jbp_category_id" + > + </key> + + <one-to-many + class="org.jboss.portlet.forums.impl.ForumImpl" + /> + + </bag> + + <property + name="order" + type="int" + update="true" + insert="true" + column="jbp_order" + unique="false" + /> + + <property + name="title" + type="java.lang.String" + update="true" + insert="true" + column="jbp_title" + unique="false" + /> + + <!-- + To add non XDoclet property mappings, create a file named + hibernate-properties-CategoryImpl.xml + containing the additional properties and place it in your merge dir. + --> + + </class> + +</hibernate-mapping> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/ForumImpl.hbm.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/ForumImpl.hbm.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/ForumImpl.hbm.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,190 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping +> + <class + name="org.jboss.portlet.forums.impl.ForumImpl" + table="jbp_forums_forums" + > + + <id + name="ID" + column="jbp_id" + type="java.lang.Integer" + > + <generator class="native"> + <!-- + To add non XDoclet generator parameters, create a file named + hibernate-generator-params-ForumImpl.xml + containing the additional parameters and place it in your merge dir. + --> + </generator> + </id> + + <many-to-one + name="category" + class="org.jboss.portlet.forums.impl.CategoryImpl" + cascade="none" + outer-join="auto" + update="true" + insert="true" + column="jbp_category_id" + /> + + <property + name="description" + type="java.lang.String" + update="true" + insert="true" + column="jbp_description" + unique="false" + /> + + <many-to-one + name="lastPost" + class="org.jboss.portlet.forums.impl.PostImpl" + cascade="all" + outer-join="auto" + update="true" + insert="true" + column="jbp_last_post_id" + /> + + <property + name="name" + type="java.lang.String" + update="true" + insert="true" + column="jbp_name" + unique="false" + /> + + <property + name="order" + type="int" + update="true" + insert="true" + column="jbp_order" + unique="false" + /> + + <property + name="topicCount" + type="int" + update="true" + insert="true" + column="jbp_topic_count" + unique="false" + /> + + <property + name="postCount" + type="int" + update="true" + insert="true" + column="jbp_post_count" + unique="false" + /> + + <property + name="pruneEnable" + type="boolean" + update="true" + insert="true" + column="jbp_prune_enable" + unique="false" + /> + + <property + name="pruneNext" + type="int" + update="true" + insert="true" + column="jbp_prune_next" + unique="false" + /> + + <property + name="status" + type="int" + update="true" + insert="true" + column="jbp_status" + unique="false" + /> + + <bag + name="topics" + lazy="true" + inverse="true" + cascade="all" + > + + <key + column="jbp_forum_id" + > + </key> + + <one-to-many + class="org.jboss.portlet.forums.impl.TopicImpl" + /> + + </bag> + + <bag + name="forumWatch" + lazy="true" + inverse="true" + cascade="all" + > + + <key + column="jbp_forum_id" + > + </key> + + <one-to-many + class="org.jboss.portlet.forums.impl.ForumWatchImpl" + /> + + </bag> + + <property + name="type" + type="int" + update="true" + insert="true" + column="jbp_type" + /> + + <bag + name="watches" + lazy="true" + inverse="true" + cascade="all" + > + + <key + column="jbp_forum_id" + > + </key> + + <one-to-many + class="org.jboss.portlet.forums.impl.ForumWatchImpl" + /> + + </bag> + + <!-- + To add non XDoclet property mappings, create a file named + hibernate-properties-ForumImpl.xml + containing the additional properties and place it in your merge dir. + --> + + </class> + +</hibernate-mapping> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PollImpl.hbm.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PollImpl.hbm.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PollImpl.hbm.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping +> + <class + name="org.jboss.portlet.forums.impl.PollImpl" + table="jbp_forums_polls" + > + + <id + name="ID" + column="jbp_poll_id" + type="java.lang.Integer" + > + <generator class="native"> + <!-- + To add non XDoclet generator parameters, create a file named + hibernate-generator-params-PollImpl.xml + containing the additional parameters and place it in your merge dir. + --> + </generator> + </id> + + <list + name="options" + table="jbp_forums_poll_option" + lazy="true" + cascade="all" + > + + <key + column="jbp_poll_id" + > + </key> + + <index + column="jbp_poll_option_position" + /> + + <composite-element + class="org.jboss.portlet.forums.impl.PollOptionImpl" + > + <property + name="votes" + type="int" + update="true" + insert="true" + column="jbp_votes" + not-null="true" + /> + + <property + name="question" + type="java.lang.String" + update="true" + insert="true" + column="jbp_question" + not-null="true" + /> + + </composite-element> + + </list> + + <property + name="title" + type="java.lang.String" + update="true" + insert="true" + column="jbp_title" + /> + + <property + name="length" + type="int" + update="true" + insert="true" + column="jbp_length" + unique="false" + /> + + <set + name="voted" + table="jbp_forums_poll_voted" + lazy="true" + cascade="all" + sort="unsorted" + > + + <key + column="jbp_poll_id" + > + </key> + + <element + column="jbp_poll_voted" + type="integer" + not-null="true" + unique="false" + /> + + </set> + + <property + name="creationDate" + type="java.util.Date" + update="true" + insert="true" + column="jbp_creation_date" + not-null="true" + /> + + <!-- + To add non XDoclet property mappings, create a file named + hibernate-properties-PollImpl.xml + containing the additional properties and place it in your merge dir. + --> + + </class> + +</hibernate-mapping> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping +> + <class + name="org.jboss.portlet.forums.impl.PostImpl" + table="jbp_forums_posts" + > + + <id + name="ID" + column="jbp_id" + type="java.lang.Integer" + > + <generator class="native"> + <!-- + To add non XDoclet generator parameters, create a file named + hibernate-generator-params-PostImpl.xml + containing the additional parameters and place it in your merge dir. + --> + </generator> + </id> + + <many-to-one + name="topic" + class="org.jboss.portlet.forums.impl.TopicImpl" + cascade="none" + outer-join="auto" + update="true" + insert="true" + column="jbp_topic_id" + /> + + <property + name="editCount" + type="int" + update="true" + insert="true" + column="jbp_edit_count" + unique="false" + /> + + <property + name="editDate" + type="java.util.Date" + update="true" + insert="true" + column="jbp_edit_date" + unique="false" + /> + + <property + name="createDate" + type="java.util.Date" + update="false" + insert="true" + column="jbp_create_date" + unique="false" + /> + + <component + name="message" + class="org.jboss.portlet.forums.impl.MessageImpl" + > + <property + name="subject" + type="java.lang.String" + update="true" + insert="true" + column="jbp_subject" + /> + + <property + name="text" + type="text" + update="true" + insert="true" + column="jbp_text" + /> + + <property + name="HTMLEnabled" + type="boolean" + update="true" + insert="true" + column="jbp_htmlenabled" + /> + + </component> + + <many-to-one + name="poster" + class="org.jboss.portlet.forums.impl.PosterImpl" + cascade="none" + outer-join="auto" + update="true" + insert="true" + column="jbp_poster_id" + /> + + <!-- + To add non XDoclet property mappings, create a file named + hibernate-properties-PostImpl.xml + containing the additional properties and place it in your merge dir. + --> + + </class> + +</hibernate-mapping> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PosterImpl.hbm.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PosterImpl.hbm.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PosterImpl.hbm.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping +> + <class + name="org.jboss.portlet.forums.impl.PosterImpl" + table="jbp_forums_posters" + > + + <id + name="ID" + column="jbp_id" + type="java.lang.Integer" + > + <generator class="native"> + <!-- + To add non XDoclet generator parameters, create a file named + hibernate-generator-params-PosterImpl.xml + containing the additional parameters and place it in your merge dir. + --> + </generator> + </id> + + <property + name="userID" + type="java.lang.Integer" + update="true" + insert="true" + column="jbp_user_id" + unique="true" + /> + + <property + name="postCount" + type="int" + update="true" + insert="true" + column="jbp_post_count" + /> + + <!-- + To add non XDoclet property mappings, create a file named + hibernate-properties-PosterImpl.xml + containing the additional properties and place it in your merge dir. + --> + + </class> + +</hibernate-mapping> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/TopicImpl.hbm.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/TopicImpl.hbm.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/TopicImpl.hbm.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping +> + <class + name="org.jboss.portlet.forums.impl.TopicImpl" + table="jbp_forums_topics" + > + + <id + name="ID" + column="jbp_id" + type="java.lang.Integer" + > + <generator class="native"> + <!-- + To add non XDoclet generator parameters, create a file named + hibernate-generator-params-TopicImpl.xml + containing the additional parameters and place it in your merge dir. + --> + </generator> + </id> + + <many-to-one + name="forum" + class="org.jboss.portlet.forums.impl.ForumImpl" + cascade="none" + outer-join="auto" + update="true" + insert="true" + column="jbp_forum_id" + /> + + <property + name="viewCount" + type="int" + update="true" + insert="true" + column="jbp_view_count" + unique="false" + /> + + <property + name="replies" + type="int" + update="true" + insert="true" + column="jbp_replies" + unique="false" + /> + + <many-to-one + name="firstPost" + class="org.jboss.portlet.forums.impl.PostImpl" + cascade="none" + outer-join="auto" + update="true" + insert="true" + column="jbp_first_post_id" + /> + + <many-to-one + name="lastPost" + class="org.jboss.portlet.forums.impl.PostImpl" + cascade="none" + outer-join="auto" + update="true" + insert="true" + column="jbp_last_post_id" + /> + + <property + name="lastPostDate" + type="java.util.Date" + update="true" + insert="true" + column="jbp_last_post_date" + unique="false" + /> + + <many-to-one + name="poster" + class="org.jboss.portlet.forums.impl.PosterImpl" + cascade="none" + outer-join="auto" + update="true" + insert="true" + column="jbp_poster" + /> + + <property + name="type" + type="int" + update="true" + insert="true" + column="jbp_type" + unique="false" + /> + + <property + name="status" + type="int" + update="true" + insert="true" + column="jbp_status" + unique="false" + /> + + <one-to-one + name="target" + class="org.jboss.portlet.forums.impl.TopicImpl" + cascade="none" + outer-join="auto" + constrained="false" + /> + + <property + name="subject" + type="java.lang.String" + update="true" + insert="true" + column="jbp_subject" + unique="false" + /> + + <bag + name="watches" + lazy="true" + inverse="true" + cascade="all" + > + + <key + column="jbp_topic_id" + > + </key> + + <one-to-many + class="org.jboss.portlet.forums.impl.TopicWatchImpl" + /> + + </bag> + + <many-to-one + name="poll" + class="org.jboss.portlet.forums.impl.PollImpl" + cascade="none" + outer-join="auto" + update="true" + insert="true" + column="jbp_poll" + not-null="false" + /> + + <!-- + To add non XDoclet property mappings, create a file named + hibernate-properties-TopicImpl.xml + containing the additional properties and place it in your merge dir. + --> + + </class> + +</hibernate-mapping> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/WatchImpl.hbm.xml =================================================================== --- trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/WatchImpl.hbm.xml 2005-08-12 13:57:23 UTC (rev 834) +++ trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/WatchImpl.hbm.xml 2005-08-12 15:01:58 UTC (rev 835) @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping +> + <class + name="org.jboss.portlet.forums.impl.WatchImpl" + table="jbp_forums_watch" + > + + <id + name="ID" + column="jbp_id" + type="java.lang.Integer" + > + <generator class="native"> + <!-- + To add non XDoclet generator parameters, create a file named + hibernate-generator-params-WatchImpl.xml + containing the additional parameters and place it in your merge dir. + --> + </generator> + </id> + + <many-to-one + name="poster" + class="org.jboss.portlet.forums.impl.PosterImpl" + cascade="none" + outer-join="auto" + update="true" + insert="true" + column="jbp_poster_id" + /> + + <property + name="mode" + type="int" + update="true" + insert="true" + column="jbp_mode" + unique="false" + /> + + <!-- + To add non XDoclet property mappings, create a file named + hibernate-properties-WatchImpl.xml + containing the additional properties and place it in your merge dir. + --> + + <joined-subclass + name="org.jboss.portlet.forums.impl.TopicWatchImpl" + table="jbp_forums_topicswatch" + > + <key + column="jbp_id" + /> + + <many-to-one + name="topic" + class="org.jboss.portlet.forums.impl.TopicImpl" + cascade="none" + outer-join="auto" + update="true" + insert="true" + column="jbp_topic_id" + /> + + </joined-subclass> + <joined-subclass + name="org.jboss.portlet.forums.impl.ForumWatchImpl" + table="jbp_forums_forumswatch" + > + <key + column="jbp_id" + /> + + <many-to-one + name="forum" + class="org.jboss.portlet.forums.impl.ForumImpl" + cascade="none" + outer-join="auto" + update="true" + insert="true" + column="jbp_forum_id" + /> + + </joined-subclass> + + </class> + +</hibernate-mapping> Added: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.war =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.war ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
|
From: <jbo...@li...> - 2005-08-12 13:58:43
|
Author: aron.gombas
Date: 2005-08-12 09:57:23 -0400 (Fri, 12 Aug 2005)
New Revision: 834
Modified:
trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml
Log:
Heavy monitored resources commented out
Modified: trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml 2005-08-12 13:57:03 UTC (rev 833)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml 2005-08-12 13:57:23 UTC (rev 834)
@@ -34,6 +34,7 @@
</portlet-info>
</portlet>
+<!--
<portlet>
<portlet-name>AtlassianJiraMonitoringPortlet</portlet-name>
<portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class>
@@ -71,7 +72,9 @@
<title>JIRA Monitoring</title>
</portlet-info>
</portlet>
+-->
+<!--
<portlet>
<portlet-name>CodehausJiraMonitoringPortlet</portlet-name>
<portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class>
@@ -112,6 +115,7 @@
<title>JIRA Monitoring</title>
</portlet-info>
</portlet>
+-->
<portlet>
<portlet-name>JBossJiraMonitoringPortlet</portlet-name>
@@ -306,6 +310,7 @@
</portlet-info>
</portlet>
+<!--
<portlet>
<portlet-name>ApacheSvnMonitoringPortlet</portlet-name>
<portlet-class>hu.midori.kosmos.portlet.svn.SvnMonitoringPortlet</portlet-class>
@@ -337,4 +342,5 @@
<title>Subversion Monitoring</title>
</portlet-info>
</portlet>
+-->
</portlet-app>
|
|
From: <jbo...@li...> - 2005-08-12 13:58:30
|
Author: aron.gombas
Date: 2005-08-12 09:57:03 -0400 (Fri, 12 Aug 2005)
New Revision: 833
Modified:
trunk/labs/kosmos/xdocs/reference/reference-manual.xml
Log:
Section added about Pluto
Modified: trunk/labs/kosmos/xdocs/reference/reference-manual.xml
===================================================================
--- trunk/labs/kosmos/xdocs/reference/reference-manual.xml 2005-08-12 13:34:51 UTC (rev 832)
+++ trunk/labs/kosmos/xdocs/reference/reference-manual.xml 2005-08-12 13:57:03 UTC (rev 833)
@@ -810,7 +810,9 @@
<para>Deploy Jakarta Slide to JBoss AS and configure it as
written in the appropriate manuals. Test if you can access
- the Slide repositories through a WebDAV navigator.</para>
+ the Slide repositories through a WebDAV navigator. If you
+ use Windows XP, it is able to map a WebDAV repository as
+ a folder to your filesystem.</para>
</listitem>
@@ -892,6 +894,48 @@
<section>
+ <title>Deployment step-by-step for Apache Pluto</title>
+
+ <para>
+
+ Follow these steps:
+ <orderedlist>
+
+ <listitem>
+
+ <para>TODO what to do with the server component?
+ </para>
+
+ </listitem>
+
+ <listitem>
+
+ <para>Install Pluto as written in its manual. We recommend
+ using the bundle distribution, because that contains both the
+ Apache Tomcat servlet container and the Pluto portlet container
+ in a single package.
+ You can find Pluto at <ulink url="http://portals.apache.org/pluto/">
+ http://portals.apache.org/pluto/</ulink> site.</para>
+
+ </listitem>
+
+ <listitem>
+
+ <para>Pluto has a portlet to deploy other portlets. It makes the
+ deployment process extremely easy: just select the portlet WAR
+ and configure the pages, Pluto will take care of all the low-level
+ details.</para>
+
+ </listitem>
+
+ </orderedlist>
+
+ </para>
+
+ </section>
+
+ <section>
+
<title>Deployment step-by-step for Sun Server Portal</title>
<para>TODO write this later</para>
|
|
From: <jbo...@li...> - 2005-08-12 13:36:53
|
Author: aron.gombas
Date: 2005-08-12 09:34:51 -0400 (Fri, 12 Aug 2005)
New Revision: 832
Added:
trunk/labs/kosmos/web-portlet/WEB-INF/lib/commons-collections-3.1.jar
Modified:
trunk/labs/kosmos/build/build.xml
Log:
Better JSR168 compatibility
Modified: trunk/labs/kosmos/build/build.xml
===================================================================
--- trunk/labs/kosmos/build/build.xml 2005-08-12 12:31:36 UTC (rev 831)
+++ trunk/labs/kosmos/build/build.xml 2005-08-12 13:34:51 UTC (rev 832)
@@ -78,7 +78,6 @@
<!-- copy other binary files -->
<copy todir="${dist-bin.bin.dir}">
<fileset dir="${web.dir}" excludes="**/*.jsp">
- <exclude name="**/commons-logging*.jar"/>
<exclude name="**/portlet-api*.jar"/>
<exclude name="**/servletapi*.jar"/>
</fileset>
Added: trunk/labs/kosmos/web-portlet/WEB-INF/lib/commons-collections-3.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/labs/kosmos/web-portlet/WEB-INF/lib/commons-collections-3.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
|
|
From: <jbo...@li...> - 2005-08-12 12:32:58
|
Author: aron.gombas Date: 2005-08-12 08:31:36 -0400 (Fri, 12 Aug 2005) New Revision: 831 Modified: trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml Log: Fixed XML element order Modified: trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml =================================================================== --- trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml 2005-08-12 12:26:36 UTC (rev 830) +++ trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml 2005-08-12 12:31:36 UTC (rev 831) @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0"> +xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0"> <portlet> <portlet-name>LocalCcMonitoringPortlet</portlet-name> <portlet-class>hu.midori.kosmos.portlet.cc.CcMonitoringPortlet</portlet-class> - <supported-locale>en</supported-locale> - <supported-locale>hu</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.cc.ccmonitoringportlet</resource-bundle> <init-param> <name>monitored.resource</name> <value>Local builds</value> @@ -29,6 +26,9 @@ <portlet-mode>HELP</portlet-mode> <portlet-mode>VIEW</portlet-mode> </supports> + <supported-locale>en</supported-locale> + <supported-locale>hu</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.cc.ccmonitoringportlet</resource-bundle> <portlet-info> <title>CruiseControl Monitoring</title> </portlet-info> @@ -37,9 +37,6 @@ <portlet> <portlet-name>AtlassianJiraMonitoringPortlet</portlet-name> <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> - <supported-locale>en</supported-locale> - <supported-locale>hu</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.jira.jiramonitoringportlet</resource-bundle> <init-param> <name>monitored.resource</name> <value>Atlassian JIRA</value> @@ -67,6 +64,9 @@ <portlet-mode>HELP</portlet-mode> <portlet-mode>VIEW</portlet-mode> </supports> + <supported-locale>en</supported-locale> + <supported-locale>hu</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.jira.jiramonitoringportlet</resource-bundle> <portlet-info> <title>JIRA Monitoring</title> </portlet-info> @@ -75,9 +75,6 @@ <portlet> <portlet-name>CodehausJiraMonitoringPortlet</portlet-name> <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> - <supported-locale>en</supported-locale> - <supported-locale>hu</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.jira.jiramonitoringportlet</resource-bundle> <init-param> <name>monitored.resource</name> <value>Codehaus JIRA</value> @@ -108,6 +105,9 @@ <portlet-mode>HELP</portlet-mode> <portlet-mode>VIEW</portlet-mode> </supports> + <supported-locale>en</supported-locale> + <supported-locale>hu</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.jira.jiramonitoringportlet</resource-bundle> <portlet-info> <title>JIRA Monitoring</title> </portlet-info> @@ -116,9 +116,6 @@ <portlet> <portlet-name>JBossJiraMonitoringPortlet</portlet-name> <portlet-class>hu.midori.kosmos.portlet.jira.JiraMonitoringPortlet</portlet-class> - <supported-locale>en</supported-locale> - <supported-locale>hu</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.jira.jiramonitoringportlet</resource-bundle> <init-param> <name>monitored.resource</name> <value>JBoss JIRA</value> @@ -169,6 +166,9 @@ <portlet-mode>HELP</portlet-mode> <portlet-mode>VIEW</portlet-mode> </supports> + <supported-locale>en</supported-locale> + <supported-locale>hu</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.jira.jiramonitoringportlet</resource-bundle> <portlet-info> <title>JIRA Monitoring</title> </portlet-info> @@ -177,9 +177,6 @@ <portlet> <portlet-name>KosmosDependenciesSfMonitoringPortlet</portlet-name> <portlet-class>hu.midori.kosmos.portlet.sf.SfMonitoringPortlet</portlet-class> - <supported-locale>en</supported-locale> - <supported-locale>hu</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.sf.sfmonitoringportlet</resource-bundle> <init-param> <name>monitored.resource</name> <value>Kosmos Dependencies</value> @@ -204,6 +201,9 @@ <portlet-mode>HELP</portlet-mode> <portlet-mode>VIEW</portlet-mode> </supports> + <supported-locale>en</supported-locale> + <supported-locale>hu</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.sf.sfmonitoringportlet</resource-bundle> <portlet-info> <title>SourceForge Monitoring</title> </portlet-info> @@ -212,9 +212,6 @@ <portlet> <portlet-name>JBossProductsSfMonitoringPortlet</portlet-name> <portlet-class>hu.midori.kosmos.portlet.sf.SfMonitoringPortlet</portlet-class> - <supported-locale>en</supported-locale> - <supported-locale>hu</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.sf.sfmonitoringportlet</resource-bundle> <init-param> <name>monitored.resource</name> <value>JBoss Products</value> @@ -234,6 +231,9 @@ <portlet-mode>HELP</portlet-mode> <portlet-mode>VIEW</portlet-mode> </supports> + <supported-locale>en</supported-locale> + <supported-locale>hu</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.sf.sfmonitoringportlet</resource-bundle> <portlet-info> <title>Sourceforge Monitoring</title> </portlet-info> @@ -242,9 +242,6 @@ <portlet> <portlet-name>KosmosToolsSfMonitoringPortlet</portlet-name> <portlet-class>hu.midori.kosmos.portlet.sf.SfMonitoringPortlet</portlet-class> - <supported-locale>en</supported-locale> - <supported-locale>hu</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.sf.sfmonitoringportlet</resource-bundle> <init-param> <name>monitored.resource</name> <value>Kosmos Development Tools</value> @@ -265,6 +262,9 @@ <portlet-mode>HELP</portlet-mode> <portlet-mode>VIEW</portlet-mode> </supports> + <supported-locale>en</supported-locale> + <supported-locale>hu</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.sf.sfmonitoringportlet</resource-bundle> <portlet-info> <title>Sourceforge Monitoring</title> </portlet-info> @@ -273,9 +273,6 @@ <portlet> <portlet-name>JBossSvnMonitoringPortlet</portlet-name> <portlet-class>hu.midori.kosmos.portlet.svn.SvnMonitoringPortlet</portlet-class> - <supported-locale>en</supported-locale> - <supported-locale>hu</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.svn.svnmonitoringportlet</resource-bundle> <init-param> <name>monitored.resource</name> <value>JBoss Labs Subversion</value> @@ -301,17 +298,17 @@ <portlet-mode>HELP</portlet-mode> <portlet-mode>VIEW</portlet-mode> </supports> + <supported-locale>en</supported-locale> + <supported-locale>hu</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.svn.svnmonitoringportlet</resource-bundle> <portlet-info> <title>Subversion Monitoring</title> </portlet-info> </portlet> - + <portlet> <portlet-name>ApacheSvnMonitoringPortlet</portlet-name> <portlet-class>hu.midori.kosmos.portlet.svn.SvnMonitoringPortlet</portlet-class> - <supported-locale>en</supported-locale> - <supported-locale>hu</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.svn.svnmonitoringportlet</resource-bundle> <init-param> <name>monitored.resource</name> <value>JBoss Labs Subversion</value> @@ -333,6 +330,9 @@ <portlet-mode>HELP</portlet-mode> <portlet-mode>VIEW</portlet-mode> </supports> + <supported-locale>en</supported-locale> + <supported-locale>hu</supported-locale> + <resource-bundle>hu.midori.kosmos.portlet.svn.svnmonitoringportlet</resource-bundle> <portlet-info> <title>Subversion Monitoring</title> </portlet-info> |
|
From: <jbo...@li...> - 2005-08-12 12:28:00
|
Author: aron.gombas Date: 2005-08-12 08:26:36 -0400 (Fri, 12 Aug 2005) New Revision: 830 Modified: trunk/labs/kosmos/build/kosmos-project.properties Log: Verno inced Modified: trunk/labs/kosmos/build/kosmos-project.properties =================================================================== --- trunk/labs/kosmos/build/kosmos-project.properties 2005-08-12 12:26:20 UTC (rev 829) +++ trunk/labs/kosmos/build/kosmos-project.properties 2005-08-12 12:26:36 UTC (rev 830) @@ -1,3 +1,3 @@ project.name=Kosmos project.name.short=kosmos -project.version=0.1.0RC1 +project.version=0.1.0RC2 |
|
From: <jbo...@li...> - 2005-08-12 12:27:44
|
Author: aron.gombas
Date: 2005-08-12 08:26:20 -0400 (Fri, 12 Aug 2005)
New Revision: 829
Modified:
trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp
trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp
trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp
trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp
Log:
Columns grouped
Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp 2005-08-11 23:37:01 UTC (rev 828)
+++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp 2005-08-12 12:26:20 UTC (rev 829)
@@ -6,45 +6,40 @@
<table>
<tr class="portlet-section-body">
<td><fmt:message key="ccproject.buildTime"/>:</td>
- <td><c:out value="${project.buildTime}"/></td>
- <td> </td>
+ <td colspan="2"><c:out value="${project.buildTime}"/></td>
</tr>
<tr class="portlet-section-alternate">
<td><fmt:message key="ccproject.testsSucceded"/>:</td>
- <td>
+ <td colspan="2">
<c:out value="${project.testsSucceded}"/>
(<fmt:formatNumber value="${project.successRate}" type="percent"/>)
</td>
- <td> </td>
</tr>
<tr class="portlet-section-body">
<td><fmt:message key="ccproject.failures"/>:</td>
- <td>
+ <td colspan="2">
<c:if test="${project.failures > 0}"><span class="portlet-msg-error"></c:if>
<c:out value="${project.failures}"/>
(<fmt:formatNumber value="${project.failures / project.tests}" type="percent"/>)
<c:if test="${project.failures > 0}"></span></c:if>
</td>
- <td> </td>
</tr>
<tr class="portlet-section-alternate">
<td><fmt:message key="ccproject.errors"/>:</td>
- <td>
+ <td colspan="2">
<c:if test="${project.errors > 0}"><span class="portlet-msg-error"></c:if>
<c:out value="${project.errors}"/>
(<fmt:formatNumber value="${project.errors / project.tests}" type="percent"/>)
<c:if test="${project.errors > 0}"></span></c:if>
</td>
- <td> </td>
</tr>
<tr class="portlet-section-body">
<td><fmt:message key="ccproject.tests"/>:</td>
- <td>
+ <td colspan="2">
<c:if test="${project.tests == 0}"><span class="portlet-msg-alert"></c:if>
<c:out value="${project.tests}"/>
<c:if test="${project.tests == 0}"></span></c:if>
</td>
- <td> </td>
</tr>
<tr class="portlet-section-alternate">
<td><fmt:message key="ccproject.testsPerCategory"/>:</td>
Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp 2005-08-11 23:37:01 UTC (rev 828)
+++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp 2005-08-12 12:26:20 UTC (rev 829)
@@ -6,13 +6,11 @@
<table>
<tr class="portlet-section-body">
<td><fmt:message key="jiraproject.description"/>:</td>
- <td><c:out value="${project.description}"/></td>
- <td> </td>
+ <td colspan="2"><c:out value="${project.description}"/></td>
</tr>
<tr class="portlet-section-alternate">
<td><fmt:message key="jiraproject.projectUrl"/>:</td>
- <td><a href="<c:out value="${project.projectUrl}"/>"><c:out value="${project.projectUrl}"/></a></td>
- <td> </td>
+ <td colspan="2"><a href="<c:out value="${project.projectUrl}"/>"><c:out value="${project.projectUrl}"/></a></td>
</tr>
<tr class="portlet-section-body">
<td><fmt:message key="jiraproject.issuesByStatus"/>:</td>
Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp 2005-08-11 23:37:01 UTC (rev 828)
+++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp 2005-08-12 12:26:20 UTC (rev 829)
@@ -6,23 +6,19 @@
<table>
<tr class="portlet-section-body">
<td><fmt:message key="svnrepository.commitsToday"/>:</td>
- <td><c:out value="${repository.commitsToday}"/></td>
- <td> </td>
+ <td colspan="2"><c:out value="${repository.commitsToday}"/></td>
</tr>
<tr class="portlet-section-alternate">
<td><fmt:message key="svnrepository.commitsLast7Days"/>:</td>
- <td><c:out value="${repository.commitsLast7Days}"/></td>
- <td> </td>
+ <td colspan="2"><c:out value="${repository.commitsLast7Days}"/></td>
</tr>
<tr class="portlet-section-body">
<td><fmt:message key="svnrepository.commitsLast31Days"/>:</td>
- <td><c:out value="${repository.commitsLast31Days}"/></td>
- <td> </td>
+ <td colspan="2"><c:out value="${repository.commitsLast31Days}"/></td>
</tr>
<tr class="portlet-section-alternate">
<td><fmt:message key="svnrepository.commitsTotal"/>:</td>
- <td><c:out value="${repository.commitsTotal}"/></td>
- <td> </td>
+ <td colspan="2"><c:out value="${repository.commitsTotal}"/></td>
</tr>
<tr class="portlet-section-body">
<td><fmt:message key="svnrepository.commitHistory"/>:</td>
Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp 2005-08-11 23:37:01 UTC (rev 828)
+++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp 2005-08-12 12:26:20 UTC (rev 829)
@@ -6,13 +6,11 @@
<table>
<tr class="portlet-section-body">
<td><fmt:message key="svnrepository.latestTouchAuthor"/>:</td>
- <td><c:out value="${repository.latestTouchAuthor}"/></td>
- <td> </td>
+ <td colspan="2"><c:out value="${repository.latestTouchAuthor}"/></td>
</tr>
<tr class="portlet-section-alternate">
<td><fmt:message key="svnrepository.latestTouchMessage"/>:</td>
- <td><c:out value="${repository.latestTouchMessage}"/></td>
- <td> </td>
+ <td colspan="2"><c:out value="${repository.latestTouchMessage}"/></td>
</tr>
<tr class="portlet-section-body">
<td><fmt:message key="svnrepository.mostActiveCommitters"/>:</td>
@@ -33,7 +31,7 @@
</tr>
<tr class="portlet-section-alternate">
<td><fmt:message key="svnrepository.mostActiveFiles"/>:</td>
- <td><img src="<c:out value="${repository.commitsPerFileChartUrl}"/>" title="<fmt:message key="svnrepository.mostActiveFiles"/>"/>"/></td>
+ <td><img src="<c:out value="${repository.commitsPerFileChartUrl}"/>" title="<fmt:message key="svnrepository.mostActiveFiles"/>"/></td>
<td valign="top">
<table>
<c:forEach var="item" items="${repository.commitsPerFile}" varStatus="status">
|
|
From: <jbo...@li...> - 2005-08-11 23:38:20
|
Author: szimano Date: 2005-08-11 19:37:01 -0400 (Thu, 11 Aug 2005) New Revision: 828 Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeHandler.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypes.xml trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLWikiType.java Log: couple files missing for plugins in wiki Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeHandler.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeHandler.java 2005-08-11 23:24:01 UTC (rev 827) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeHandler.java 2005-08-11 23:37:01 UTC (rev 828) @@ -0,0 +1,179 @@ +/************************************************** + * * + * JBoss Labs: Creating Professional Open Source * + * * + * Distributable under LGPL license. * + * See terms of license at gnu.org. * + * * + *************************************************/ +package org.jboss.wiki; + +import java.util.Stack; + +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; +import org.xml.sax.helpers.DefaultHandler; + +/** + * The WikiTypeHandler for parsing WikiType xml file. + * <p> + * + * @author <a href="mailto:ds...@jb...">Damon Sicore</a> + * @author <a href="mailto:tom...@jb...">Tomasz Szimanski</a> + * @version $Id$ + */ + +public class WikiTypeHandler extends DefaultHandler { + + private String lastWikiType = ""; + + private Stack<String> elements = new Stack<String>(); + + private boolean isInsidePlugin = false; + + private WikiEngine wikiEngine; + + private WikiType wikiType; + + private String wikiTypeName; + + private String pluginName = "", pluginClass = ""; + + @Override + public void endDocument() throws SAXException { + super.endDocument(); + + System.out.println("WikiType configuration file parsed."); + } + + @Override + public void endElement(String uri, String localName, String qName) + throws SAXException { + super.endElement(uri, localName, qName); + + if (qName.equals("plugin")) { + isInsidePlugin = false; + } else if ((qName.equals("wikiType")) && (wikiType != null)) { + // add WikiType + + wikiEngine.addWikiType(wikiType.getName(), wikiType); + wikiType = null; + wikiTypeName = null; + } + + // System.out.println("End element: "+uri+" "+localName+" "+qName); + } + + @Override + public void error(SAXParseException e) throws SAXException { + super.error(e); + System.err.println("[WikiType Parser:ERROR]: " + e); + } + + @Override + public void fatalError(SAXParseException e) throws SAXException { + super.fatalError(e); + System.err.println("[WikiType Parser:FATAL ERROR]: " + e); + } + + @Override + public void startDocument() throws SAXException { + super.startDocument(); + System.out.println("Parsing the WikiType configuration file..."); + } + + @Override + public void startElement(String uri, String localName, String qName, + Attributes attributes) throws SAXException { + super.startElement(uri, localName, qName, attributes); + /* + * System.out.println("Element: uri: "+uri+" lname: "+localName+" qname: + * "+qName); for (int i = 0; i < attributes.getLength(); i++) { + * System.out.println("Attr "+i+": "+attributes.getQName(i)+" = + * "+attributes.getIndex(attributes.getQName(i))); } + */ + if (qName.equals("plugin")) { + isInsidePlugin = true; + } else if (qName.equals("wikiType")) { + // start building new WikiType + + //wikiType = new WikiType(); + } + + elements.push(qName); + } + + @Override + public void warning(SAXParseException e) throws SAXException { + super.warning(e); + System.out.println("[WikiType Parser:WARNING]: " + e); + } + + public WikiTypeHandler(WikiEngine wikiEngine) { + this.wikiEngine = wikiEngine; + } + + @Override + public void characters(char[] ch, int start, int length) + throws SAXException { + super.characters(ch, start, length); + String element; + + String s = (new String(ch)).substring(start, start + length); + + if (((int) s.charAt(0) != 9) + && ((int) s.charAt(0) != 10) + && (!elements.isEmpty())) { + + element = elements.pop(); + + if ((element.equals("class")) && (!isInsidePlugin)) { + // class for wikiType + + try { + wikiType = (WikiType)Class.forName(s).newInstance(); + } + catch(Exception e) { + System.err.println("Cannot load WikiType class: "+e); + } + + if (wikiTypeName != null) { + wikiType.setName(wikiTypeName); + wikiTypeName = null; + } + + } else if ((element.equals("name")) || (element.equals("class"))) { + if (isInsidePlugin) { + // set name and class - if we have them both - add plugin to + // wikitype + + if (element.equals("class")) { + pluginClass = s; + } else { + pluginName = s; + } + + + if ((pluginName.length() > 0) && (pluginClass.length() > 0)) { + // we have em both - add a plugin + + wikiType.addPlugin(pluginName, pluginClass); + + pluginClass = pluginName = ""; + } + + + } else { + // here only if found name of WikiType (see prev. if clause) + if (wikiType != null) { + wikiType.setName(s); + } + else { + wikiTypeName = s; + } + } + } + } + } +} Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypes.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypes.xml 2005-08-11 23:24:01 UTC (rev 827) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypes.xml 2005-08-11 23:37:01 UTC (rev 828) @@ -0,0 +1,16 @@ +<wikiTypes> + <wikiType> + <name>HTML</name> + <class>org.jboss.wiki.plugins.HTMLWikiType</class> + <plugin> + <name>wikiToHtmlTranslator</name> + <class>org.jboss.wiki.plugins.HTMLTranslator</class> + </plugin> + + <!--<plugin> + <name>trail</name> + <class>org.jboss.wiki.plugins.TrailPlugin</class> + </plugin>--> + + </wikiType> +</wikiTypes> \ No newline at end of file Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLWikiType.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLWikiType.java 2005-08-11 23:24:01 UTC (rev 827) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLWikiType.java 2005-08-11 23:37:01 UTC (rev 828) @@ -0,0 +1,12 @@ +package org.jboss.wiki.plugins; + +import org.jboss.wiki.WikiType; + +public class HTMLWikiType extends WikiType { + + public HTMLWikiType () { + + } + + +} |
|
From: <jbo...@li...> - 2005-08-11 23:25:26
|
Author: szimano
Date: 2005-08-11 19:24:01 -0400 (Thu, 11 Aug 2005)
New Revision: 827
Added:
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
Removed:
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/HashMap.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiParser.java
Modified:
trunk/forge/portal-extensions/forge-wiki/maven.xml
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java
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
Log:
plugins working so-so
Modified: trunk/forge/portal-extensions/forge-wiki/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-11 19:44:28 UTC (rev 826)
+++ trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-11 23:24:01 UTC (rev 827)
@@ -10,6 +10,9 @@
<ant:fileset dir="src/java/org/jboss/wiki">
<ant:filename name="*.properties" />
</ant:fileset>
+ <ant:fileset dir="src/java/org/jboss/wiki">
+ <ant:filename name="*.xml" />
+ </ant:fileset>
</ant:copy>
<attainGoal name="war" />
Deleted: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/HashMap.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/HashMap.java 2005-08-11 19:44:28 UTC (rev 826)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/HashMap.java 2005-08-11 23:24:01 UTC (rev 827)
@@ -1,8 +0,0 @@
- package org.jboss.wiki;
-
-/**
- * <p></p>
- *
- */
-public class HashMap {
- }
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java 2005-08-11 19:44:28 UTC (rev 826)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java 2005-08-11 23:24:01 UTC (rev 827)
@@ -14,7 +14,10 @@
* @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
* @version $Id$
*/
+import java.util.Date;
+
import org.jboss.portal.core.model.User;
+import org.jboss.wiki.plugins.HTMLTranslator;
/**
* <p></p>
@@ -37,7 +40,6 @@
* <p></p>
*
*/
- public WikiType wikiType;
public WikiContext(User user, WikiType requestedType) {
this.user = user;
@@ -53,8 +55,10 @@
return user;
}
- public WikiType getWikiType() {
- return wikiType;
+
+ public WikiPage process(WikiPage wikiPage) {
+ return requestedType.process(wikiPage);
}
+
}
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-11 19:44:28 UTC (rev 826)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-11 23:24:01 UTC (rev 827)
@@ -8,9 +8,15 @@
*************************************************/
package org.jboss.wiki;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.xml.sax.SAXException;
+
/**
*
* @author <a href="mailto:ds...@jb...">Damon Sicore</a>
@@ -30,17 +36,11 @@
*
*/
private String urlBase;
-
+
/**
* <p>Represents ...</p>
*
*/
- private Map wikiTypes;
-
-/**
- * <p>Represents ...</p>
- *
- */
private Map wikiTypePlugins;
/**
@@ -49,6 +49,8 @@
*/
private HashMap<String, WikiPage> pages;
+ private HashMap<String, WikiType> wikiTypes;
+
private MediaDataSource mediaDataSource;
/**
@@ -114,7 +116,7 @@
pages.put(pageName, ret);
}
- return ret;
+ return wikiContext.process(ret);
}
/**
@@ -124,18 +126,26 @@
* @return
*/
public void init() {
-
+ mediaDataSource = new FileDataSource();
+ pages = new HashMap<String, WikiPage>();
+ wikiTypes = new HashMap<String, WikiType>();
+ loadWikiTypes();
}
/**
- * <p>Does ...</p>
+ * <p>Parses configuration file to get WikiTypes</p>
*
*
* @return
*/
- protected void loadWikiTypes() {
- // your code here
- //return null;
+ protected void loadWikiTypes() {
+ try {
+ SAXParser sp = (SAXParserFactory.newInstance()).newSAXParser();
+ sp.parse(WikiTypeHandler.class.getResourceAsStream("WikiTypes.xml"), new WikiTypeHandler(this));
+ }
+ catch (Exception se) {
+ System.err.println("Error while parsing WikiType configuration: "+se);
+ }
}
/**
@@ -214,13 +224,37 @@
//return null;
}
+ public void addWikiType(String name, WikiType wikiType) {
+ System.out.println("[WIKIENGINE]: Added WikiType: "+name+" Class: "+wikiType);
+ wikiTypes.put(name, wikiType);
+ }
+
+ public WikiType getWikiType(String wikiTypeName) {
+ System.out.println("[WIKITYPE REQUEST]: "+wikiTypes.get(wikiTypeName));
+ return wikiTypes.get(wikiTypeName);
+ }
/**
* <p></p>
*
*/
public WikiEngine() {
- mediaDataSource = new FileDataSource();
- pages = new HashMap<String, WikiPage>();
-
+ init();
}
+
+
+
+ public static void main(String[] args) {
+ WikiEngine we = new WikiEngine();
+
+ WikiType wt = we.getWikiType("HTML");
+
+ WikiContext wc = new WikiContext(null, wt);
+
+ WikiPage wp = new WikiPage("name", new Credentials("tomek"), "[content|ble sme]", 1, new Date());
+
+ wp = wc.process(wp);
+
+ System.out.println(wp.getContent());
+ }
+
}
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java 2005-08-11 19:44:28 UTC (rev 826)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java 2005-08-11 23:24:01 UTC (rev 827)
@@ -6,269 +6,308 @@
* See terms of license at gnu.org. *
* *
*************************************************/
- package org.jboss.wiki;
+package org.jboss.wiki;
import java.io.Serializable;
import java.util.Date;
+import java.util.HashMap;
/**
- * <p></p>
+ * <p>
+ * </p>
*
*/
- /**
- *
- * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
- * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
- * @version $Id$
- */
-public class WikiPage implements Serializable, WikiProperties {
+/**
+ *
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
+ * @version $Id$
+ */
+public class WikiPage implements Serializable, WikiProperties, Cloneable {
-/**
+ /**
*
*/
private static final long serialVersionUID = 1L;
-/**
- * <p>Represents ...</p>
- *
- */
- private String name;
+ /**
+ * <p>
+ * Represents ...
+ * </p>
+ *
+ */
+ private String name;
-/**
- * <p>Represents ...</p>
- *
- * WikiPage
- * This class is _abstract_
- * and has to be extended by the class
- * that we're willing to show our
- * content
- *
- * functions to be extended:
- * WikiPage(...) - constructor
- * getAttributes() - gets set of atributes
- * to be send to the appropriate JSP page
- * saveThisPage(data:Object) - saves
- * next version of this page with new data
- * getJSPPath() - gets apropriate JSP page
- * to show plugin
- * getDataProviderName - gets name of
- * the plugin _must_ be the same as in the
- * plugin name in plugin.xml
- */
- private Credentials lastAuthor;
+ /**
+ * <p>
+ * Represents ...
+ * </p>
+ *
+ * WikiPage This class is _abstract_ and has to be extended by the class
+ * that we're willing to show our content
+ *
+ * functions to be extended: WikiPage(...) - constructor getAttributes() -
+ * gets set of atributes to be send to the appropriate JSP page
+ * saveThisPage(data:Object) - saves next version of this page with new data
+ * getJSPPath() - gets apropriate JSP page to show plugin
+ * getDataProviderName - gets name of the plugin _must_ be the same as in
+ * the plugin name in plugin.xml
+ */
+ private Credentials lastAuthor;
-/**
- * <p>Represents ...</p>
- *
- */
- private int lastVersion;
+ /**
+ * <p>
+ * Represents ...
+ * </p>
+ *
+ */
+ private int lastVersion;
-/**
- * <p>Represents ...</p>
- *
- */
- private Date editDate;
+ /**
+ * <p>
+ * Represents ...
+ * </p>
+ *
+ */
+ private Date editDate;
-/**
- * <p>Represents ...</p>
- *
- */
- private MediaDataSource mediaDataSource;
+ /**
+ * <p>
+ * Represents ...
+ * </p>
+ *
+ */
+ private MediaDataSource mediaDataSource;
-/**
- * <p></p>
- *
- */
- public WikiEngine wikiEngine;
-/**
- * <p></p>
- *
- */
- public WikiEngine wikiEngine_1;
-
- private String pageContent;
+ /**
+ * <p>
+ * </p>
+ *
+ */
+ public WikiEngine wikiEngine;
-/**
- * <p>Does ...</p>
- *
- *
- * @return
- * @param pageName
- * @param data
- * @param pageAuthor
- * @param pageDate
- */
- public static WikiPage createPage(String pageName, Object data, String pageAuthor, java.util.Date pageDate) {
- // your code here
- return null;
- }
+ /**
+ * <p>
+ * </p>
+ *
+ */
+ public WikiEngine wikiEngine_1;
-/**
- * <p>Does ...</p>
- *
- *
- * @param pageName
- * @param pageAuthor
- * @param path
- */
- public WikiPage(String pageName, Credentials pageAuthor, String pageContent, int pageVersion, Date editDate) {
- name = pageName;
- lastAuthor = pageAuthor;
- this.pageContent = pageContent;
- lastVersion = pageVersion;
- this.editDate = editDate;
- }
+ private String pageContent;
-/**
- * <p>Does ...</p>
- *
- *
- * @return
- */
- public HashMap getAttributes() {
- // your code here
- return null;
- }
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @return
+ * @param pageName
+ * @param data
+ * @param pageAuthor
+ * @param pageDate
+ */
+ public static WikiPage createPage(String pageName, Object data,
+ String pageAuthor, java.util.Date pageDate) {
+ // your code here
+ return null;
+ }
-/**
- * <p>Does ...</p>
- *
- */
- public void save() {
- // your code here
- }
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @param pageName
+ * @param pageAuthor
+ * @param path
+ */
+ public WikiPage(String pageName, Credentials pageAuthor,
+ String pageContent, int pageVersion, Date editDate) {
+ name = pageName;
+ lastAuthor = pageAuthor;
+ this.pageContent = pageContent;
+ lastVersion = pageVersion;
+ this.editDate = editDate;
+ }
-/**
- * <p>Does ...</p>
- *
- *
- * @return
- */
- public String getPath() {
- // your code here
- return null;
- }
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @return
+ */
+ public HashMap getAttributes() {
+ // your code here
+ return null;
+ }
-/**
- * <p>Does ...</p>
- *
- *
- * @return
- * @param mds
- */
- public boolean setMediaDataSource(MediaDataSource mds) {
- // your code here
- return false;
- }
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ */
+ public void save() {
+ // your code here
+ }
-/**
- * <p>Does ...</p>
- *
- *
- * @param version
- * @return
- */
- public boolean updateToVersion(int version) {
- // your code here
- return false;
- }
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @return
+ */
+ public String getPath() {
+ // your code here
+ return null;
+ }
-/**
- * <p>Does ...</p>
- *
- *
- * @return
- * @param version
- */
- public WikiPage getPageAtVersion(int version) {
- // your code here
- return null;
- }
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @return
+ * @param mds
+ */
+ public boolean setMediaDataSource(MediaDataSource mds) {
+ // your code here
+ return false;
+ }
-/**
- * <p>Does ...</p>
- *
- *
- * @return
- */
- public String getContent() {
- return getPageContent();
- }
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @param version
+ * @return
+ */
+ public boolean updateToVersion(int version) {
+ // your code here
+ return false;
+ }
-/**
- * <p>Does ...</p>
- *
- *
- * @return
- */
- public MediaDataSource getMediaDataSource() {
- // your code here
- return null;
- }
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @return
+ * @param version
+ */
+ public WikiPage getPageAtVersion(int version) {
+ // your code here
+ return null;
+ }
-/**
- * <p>Does ...</p>
- *
- *
- * @return
- * @param text
- */
- public void setWikiText(int text) {
- // your code here
- //return null;
- }
-
- public void showPage() {
- System.out.println("Page name: "+getName());
- System.out.println("Page author: "+getLastAuthor());
- System.out.println("Page version: "+getLastVersion());
- System.out.println("Page editdate: "+getEditDate());
- System.out.println("Page Content: \n"+getContent());
- }
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @return
+ */
+ public String getContent() {
+ return getPageContent();
+ }
-/**
- * <p></p>
- *
- */
- public MediaInternalization mediaInternalization;
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @return
+ */
+ public MediaDataSource getMediaDataSource() {
+ // your code here
+ return null;
+ }
-public java.util.Date getEditDate() {
- return editDate;
-}
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @return
+ * @param text
+ */
+ public void setWikiText(int text) {
+ // your code here
+ // return null;
+ }
-public void setEditDate(java.util.Date editDate) {
- this.editDate = editDate;
-}
+ public void showPage() {
+ System.out.println("Page name: " + getName());
+ System.out.println("Page author: " + getLastAuthor());
+ System.out.println("Page version: " + getLastVersion());
+ System.out.println("Page editdate: " + getEditDate());
+ System.out.println("Page Content: \n" + getContent());
+ }
-public Credentials getLastAuthor() {
- return lastAuthor;
-}
+ /**
+ * <p>
+ * </p>
+ *
+ */
+ public MediaInternalization mediaInternalization;
-public void setLastAuthor(Credentials lastAuthor) {
- this.lastAuthor = lastAuthor;
-}
+ public java.util.Date getEditDate() {
+ return editDate;
+ }
-public int getLastVersion() {
- return lastVersion;
-}
+ public void setEditDate(java.util.Date editDate) {
+ this.editDate = editDate;
+ }
-public void setLastVersion(int lastVersion) {
- this.lastVersion = lastVersion;
-}
+ public Credentials getLastAuthor() {
+ return lastAuthor;
+ }
-public String getName() {
- return name;
-}
+ public void setLastAuthor(Credentials lastAuthor) {
+ this.lastAuthor = lastAuthor;
+ }
-public void setName(String name) {
- this.name = name;
-}
+ public int getLastVersion() {
+ return lastVersion;
+ }
-public String getPageContent() {
- return pageContent;
-}
+ public void setLastVersion(int lastVersion) {
+ this.lastVersion = lastVersion;
+ }
-public void setPageContent(String pageContent) {
- this.pageContent = pageContent;
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getPageContent() {
+ return pageContent;
+ }
+
+ public void setPageContent(String pageContent) {
+ this.pageContent = pageContent;
+ }
+
+ @Override
+ public Object clone() throws CloneNotSupportedException {
+ WikiPage clonedPage = new WikiPage(getName(), getLastAuthor(),
+ getPageContent(), getLastVersion(), getEditDate());
+ return clonedPage;
+ }
}
- }
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java 2005-08-11 19:44:28 UTC (rev 826)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java 2005-08-11 23:24:01 UTC (rev 827)
@@ -31,7 +31,7 @@
* @return
* @param content
*/
- public WikiPage apply(WikiPage wikiPage);
+ public WikiPage process(WikiPage wikiPage);
/**
* <p>Does ...</p>
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-11 19:44:28 UTC (rev 826)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-11 23:24:01 UTC (rev 827)
@@ -35,47 +35,9 @@
wikiEngine = new WikiEngine();
}
- public String translateLinks(String content, String actionURL) {
- String href1regex = "\\[.+\\|.+\\]";
- String href2regex = "\\[.+\\]";
-
- String translatedContent = content;
-
- Matcher match;
-
- while ((match = Pattern.compile(href1regex).matcher(translatedContent))
- .find()) {
- translatedContent = match.replaceFirst("<a href=\""
- + actionURL
- + "&page="
- + (translatedContent.substring(translatedContent.indexOf(
- "|", match.start() + 1) + 1, match.end() - 1)).trim()
- + "\">"
- + translatedContent.substring(match.start() + 1,
- translatedContent.indexOf("|", match.start() + 1))
- + "</a>");
- }
-
- while ((match = Pattern.compile(href2regex).matcher(translatedContent))
- .find()) {
- translatedContent = match.replaceFirst("<a href=\""
- + actionURL
- + "&page="
- + (translatedContent.substring(match.start() + 1, match
- .end() - 1)).trim()
- + "\">"
- + translatedContent.substring(match.start() + 1, match
- .end() - 1) + "</a>");
- }
-
- translatedContent = translatedContent.replace("\n", "<BR>\n");
-
- return translatedContent;
- }
-
public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) {
- WikiContext wikiContext = new WikiContext(rReq.getUser(), new WikiType());
+ WikiContext wikiContext = new WikiContext(rReq.getUser(), wikiEngine.getWikiType("HTML"));
if (rReq.getParameter("action") != null) {
rResp.setRenderParameter("action", rReq.getParameter("action"));
@@ -143,7 +105,7 @@
wikiPage = rReq.getParameter("page");
}
- WikiContext wikiContext = new WikiContext(rReq.getUser(), new WikiType());
+ WikiContext wikiContext = new WikiContext(rReq.getUser(), wikiEngine.getWikiType("HTML"));
PortletURL wikiURL = rRes.createActionURL();
@@ -161,7 +123,7 @@
pageToShow = wikiEngine.getByName(wikiPage, wikiContext);
}
- rReq.setAttribute("wikiContent", (page == "Wiki.jsp") ? translateLinks(pageToShow.getContent(), wikiURL.toString()) : pageToShow.getContent());
+ rReq.setAttribute("wikiContent", pageToShow.getContent());
rReq.setAttribute("wikiPage", wikiPage);
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-11 19:44:28 UTC (rev 826)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-11 23:24:01 UTC (rev 827)
@@ -6,74 +6,140 @@
* See terms of license at gnu.org. *
* *
*************************************************/
- package org.jboss.wiki;
+package org.jboss.wiki;
+import java.util.HashMap;
import java.util.List;
+import java.util.Set;
/**
- * <p></p>
+ * <p>
+ * </p>
*
*/
- /**
- *
- * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
- * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
- * @version $Id$
- */
-public class WikiType {
-
/**
- * <p>Represents ...</p>
*
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
+ * @version $Id$
*/
- private List pluginChain;
-/**
- * <p></p>
- *
- */
- public WikiTypeDescriptor wikiTypeDescriptor;
-/**
- * <p></p>
- *
- */
- public WikiPluginChain wikiPluginChain;
-/**
- * <p></p>
- *
- */
- public WikiContext wikiContext;
+public class WikiType {
-/**
- * <p>Does ...</p>
- *
- *
- * @return
- */
- public void getPluginChain() {
- // your code here
- //return null;
- }
+ protected String name;
-/**
- * <p>Does ...</p>
- *
- *
- * @return
- */
- public void initPluginChain() {
- // your code here
- //return null;
- }
+ /**
+ * <p>
+ * Represents ...
+ * </p>
+ *
+ */
+ protected List pluginChain;
-/**
- * <p>Does ...</p>
- *
- *
- * @return
- * @param content
- */
- public String apply(String content) {
- // your code here
- return null;
- }
- }
+ /**
+ * <p>
+ * </p>
+ *
+ */
+ protected WikiTypeDescriptor wikiTypeDescriptor;
+
+ /**
+ * <p>
+ * </p>
+ *
+ */
+ protected WikiPluginChain wikiPluginChain;
+
+ /**
+ * <p>
+ * </p>
+ *
+ */
+ protected WikiContext wikiContext;
+
+ protected HashMap<String, WikiPlugin> plugins = new HashMap<String, WikiPlugin>();
+
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @return
+ */
+ public void getPluginChain() {
+ // your code here
+ // return null;
+ }
+
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @return
+ */
+
+ public void initPluginChain() {
+ // your code here
+ // return null;
+ }
+
+ public void addPlugin(String pluginName, String pluginClass) {
+
+ WikiPlugin plugin = null;
+
+ try {
+ plugin = (WikiPlugin) Class.forName(pluginClass).newInstance();
+ } catch (Exception e) {
+ System.err.println("Error while loading plugin: " + pluginName
+ + "\nclass: " + pluginClass + "\n" + e);
+ }
+
+ if (plugin != null) {
+ plugins.put(pluginName, plugin);
+
+ System.out.println("[WikiType:" + name + "]Plugin added: "
+ + pluginName + " class: " + pluginClass);
+ }
+
+ }
+
+ /**
+ * <p>
+ * Does ...
+ * </p>
+ *
+ *
+ * @return
+ * @param content
+ */
+ public WikiPage process(WikiPage wikiPage) {
+ WikiPage newPage = null;
+
+ try {
+ newPage = (WikiPage)wikiPage.clone();
+ }
+ catch (CloneNotSupportedException cnse) {
+ System.out.println("cannot clone the page: " + cnse);
+ }
+
+ Set<String> ks = plugins.keySet();
+
+ for (String str : ks) {
+ System.out.println("Executing plugin: "+str);
+ newPage = (plugins.get(str)).process(newPage);
+ }
+
+ return newPage;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ System.out.print("Setting new WikiType name: " + name);
+ this.name = name;
+ }
+}
Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-11 19:44:28 UTC (rev 826)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-11 23:24:01 UTC (rev 827)
@@ -0,0 +1,225 @@
+package org.jboss.wiki.plugins;
+
+/**
+ * @author rali
+ *
+ *
+ */
+import java.util.regex.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.StringTokenizer;
+
+import org.jboss.wiki.Credentials;
+import org.jboss.wiki.WikiPage;
+import org.jboss.wiki.WikiPlugin;
+
+public class HTMLTranslator implements WikiPlugin {
+
+ private Pattern myPattern;
+
+ private Matcher myMatcher;
+
+ /* URL components, later to be configurable */
+ private String portalHome = "http://forge.sicore.org:8080/portal/";
+
+ private String wikiHome = "index.html?ctrl:id=window.default.WikiPortletWindow";
+
+ private String actionType = "&ctrl:type=";
+
+ private String page = "&page=";
+
+ public ArrayList mediaPatterns;
+
+ public ArrayList linkPatterns;
+
+ public String[] textlinks;
+
+ public String[] notextlinks;
+
+ private String[] mediaFormats = { "*.png", "*.jpeg", "*.gif" };
+
+ public HTMLTranslator() {
+ }
+
+ /*
+ * compile all links to wiki pages or external pages of the form [...] or
+ * [...|...]
+ */
+ public String parseLinks(String text, String actionURL) {
+ String translatedContent = text;
+ String link;// = "";
+ String href1regex = "\\[.+\\|.+\\]";
+ String href2regex = "\\[.+\\]";
+ Pattern tLinks = Pattern.compile(href1regex);
+ Pattern links = Pattern.compile(href2regex);
+ Matcher textlinks = tLinks.matcher(text);
+ Matcher nontextlinks = links.matcher(text);
+
+ Matcher match;
+
+ while ((match = tLinks.matcher(translatedContent)).find()) {
+ link = (translatedContent.substring(translatedContent.indexOf("|",
+ match.start() + 1) + 1, match.end() - 1)).trim();
+ if (isExternalLink(link)) // outside link
+ {
+ translatedContent = match.replaceFirst("<a href=\""
+ + link
+ + "\">"
+ + translatedContent.substring(match.start() + 1,
+ translatedContent.indexOf("|",
+ match.start() + 1)) + "</a>");
+ } else
+ // need to implement pageExists
+ translatedContent = match.replaceFirst("<a href=\""
+ + portalHome
+ + wikiHome
+ + actionType
+ + "action"
+ + page
+ + cleanLink(link)
+ + "\">"
+ + translatedContent.substring(match.start() + 1,
+ translatedContent.indexOf("|",
+ match.start() + 1)) + "</a>");
+ }
+
+ while ((match = links.matcher(translatedContent)).find()) {
+ link = (translatedContent.substring(match.start() + 1,
+ match.end() - 1));
+ if (isExternalLink(link)) // outside link
+ {
+ translatedContent = match.replaceFirst("<a href=\"" + link
+ + "\">" + link + "</a>");
+ } else
+ translatedContent = match.replaceFirst("<a href=\""
+ + portalHome + wikiHome + actionType + "action" + page
+ + cleanLink(link) + "\">" + link + "</a>");
+ }
+
+ translatedContent = translatedContent.replace("\n", "<BR>\n");
+
+ return translatedContent;
+ }
+
+ /* a collection of all media formats allowed on wiki */
+ private Collection getImagePatterns() {
+ ArrayList patterns = new ArrayList();
+ for (int i = 0; i < mediaFormats.length; i++) {
+ patterns.add(mediaFormats[i]);
+ }
+
+ return patterns;
+ }
+
+ /**
+ * Figures out if a link is an off-site link. This recognizes the most
+ * common protocols by checking how it starts.
+ */
+ private boolean isExternalLink(String link) {
+ return link.startsWith("http:") || link.startsWith("ftp:")
+ || link.startsWith("https:") || link.startsWith("mailto:")
+ || link.startsWith("news:") || link.startsWith("file:");
+ }
+
+ /**
+ * Cleans a Wiki name.
+ * <P>[ This is a link ] -> ThisIsALink
+ *
+ * @param link
+ * Link to be cleared. Null is safe, and causes this to return
+ * null.
+ * @return A cleaned link.
+ *
+ * @since 2.0
+ */
+ public String cleanLink(String link) {
+ StringBuffer clean = new StringBuffer();
+
+ if (link == null)
+ return null;
+
+ //
+ // Compress away all whitespace and capitalize
+ // all words in between.
+ //
+
+ StringTokenizer st = new StringTokenizer(link, " -");
+
+ while (st.hasMoreTokens()) {
+ StringBuffer component = new StringBuffer(st.nextToken());
+
+ component.setCharAt(0, Character.toUpperCase(component.charAt(0)));
+
+ //
+ // We must do this, because otherwise compiling on JDK 1.4 causes
+ // a downwards incompatibility to JDK 1.3.
+ //
+ clean.append(component.toString());
+ }
+
+ //
+ // Remove non-alphanumeric characters that should not
+ // be put inside WikiNames. Note that all valid
+ // Unicode letters are considered okay for WikiNames.
+ // It is the problem of the WikiPageProvider to take
+ // care of actually storing that information.
+ //
+
+ for (int i = 0; i < clean.length(); i++) {
+ if (!(Character.isLetterOrDigit(clean.charAt(i))
+ || clean.charAt(i) == '_' || clean.charAt(i) == '.')) {
+ clean.deleteCharAt(i);
+ --i; // We just shortened this buffer.
+ }
+ }
+
+ return clean.toString();
+ }
+
+ public WikiPage process(WikiPage wikiPage) {
+ WikiPage newPage = null;
+
+ try {
+ newPage = (WikiPage) wikiPage.clone();
+ } catch (CloneNotSupportedException cnse) {
+ System.out.println("cannot clone the page: " + cnse);
+ }
+
+ String newContent = parseLinks(newPage.getContent(), "dupa");
+
+ newPage.setPageContent(newContent);
+
+ return newPage;
+ }
+
+ public void next() {
+ // TODO Auto-generated method stub
+
+ }
+
+ // public static void main(String[] args) {
+ // String wikitext = "__Forge Portal__FORGE USER HOW TO:\\\\\n"
+ // + "[Add a new project and modify its
+ // data|http://www.NewProject.com]\\\\\n"
+ // + "[Add and manage project downloads|Project Downloads]\\\\\n"
+ // + "[Add and manage project freezone|Project *Freezone]\\\\\n"
+ // + "[Project Freezone]\\\\\n"
+ // + "[http://www.google.com]\\\\\n";
+ // WikiContext wc = new WikiContext();
+ //
+ // String elements = parseLinks(wikitext, wc);
+ //
+ // System.out.println(elements);
+ // }
+
+ public static void main (String[] args) {
+ HTMLTranslator ht = new HTMLTranslator();
+
+ WikiPage wp = new WikiPage("name", new Credentials("tomek"), "content", 1, new Date());
+
+ wp = ht.process(wp);
+ }
+
+}
\ No newline at end of file
Deleted: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiParser.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiParser.java 2005-08-11 19:44:28 UTC (rev 826)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiParser.java 2005-08-11 23:24:01 UTC (rev 827)
@@ -1,196 +0,0 @@
-package org.jboss.wiki.plugins;
-
-/**
- * @author rali
- *
- *
- */
-import java.util.regex.*;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.StringTokenizer;
-
-public class WikiParser {
-
- private static Pattern myPattern;
-
- private Matcher myMatcher;
-
- /* URL components, later to be configurable */
- private static String portalHome = "http://forge.sicore.org:8080/portal/";
-
- private static String wikiHome = "index.html?ctrl:id=window.default.WikiPortletWindow";
-
- private static String actionType = "&ctrl:type=";
-
- private static String page = "&page=";
-
- public ArrayList mediaPatterns;
-
- public ArrayList linkPatterns;
-
- public static String[] textlinks;
-
- public static String[] notextlinks;
-
- private String[] mediaFormats = { "*.png", "*.jpeg", "*.gif" };
-
- public WikiParser() {
- }
-
- /*
- * compile all links to wiki pages or external pages of the form [...] or
- * [...|...]
- */
- public static String parseLinks(String text, String actionURL) {
- String translatedContent = text;
- String link;// = "";
- String href1regex = "\\[.+\\|.+\\]";
- String href2regex = "\\[.+\\]";
- Pattern tLinks = Pattern.compile(href1regex);
- Pattern links = Pattern.compile(href2regex);
- Matcher textlinks = tLinks.matcher(text);
- Matcher nontextlinks = links.matcher(text);
-
- Matcher match;
-
- while ((match = tLinks.matcher(translatedContent)).find()) {
- link = (translatedContent.substring(translatedContent.indexOf("|",
- match.start() + 1) + 1, match.end() - 1)).trim();
- if (isExternalLink(link)) //outside link
- {
- translatedContent = match.replaceFirst("<a href=\""
- + link
- + "\">"
- + translatedContent.substring(match.start() + 1,
- translatedContent.indexOf("|",
- match.start() + 1)) + "</a>");
- } else
- //need to implement pageExists
- translatedContent = match.replaceFirst("<a href=\""
- + portalHome
- + wikiHome
- + actionType
- + "action"
- + page
- + cleanLink(link)
- + "\">"
- + translatedContent.substring(match.start() + 1,
- translatedContent.indexOf("|",
- match.start() + 1)) + "</a>");
- }
-
- while ((match = links.matcher(translatedContent)).find()) {
- link = (translatedContent.substring(match.start() + 1,
- match.end() - 1));
- if (isExternalLink(link)) //outside link
- {
- translatedContent = match.replaceFirst("<a href=\""
- + link
- + "\">"
- + link + "</a>");
- }else
- translatedContent = match.replaceFirst("<a href=\"" + portalHome
- + wikiHome
- + actionType
- + "action"
- + page
- + cleanLink(link)
- + "\">"+ link + "</a>");
- }
-
- translatedContent = translatedContent.replace("\n", "<BR>\n");
-
- return translatedContent;
- }
-
- /* a collection of all media formats allowed on wiki */
- private Collection getImagePatterns() {
- ArrayList patterns = new ArrayList();
- for (int i = 0; i < mediaFormats.length; i++) {
- patterns.add(mediaFormats[i]);
- }
-
- return patterns;
- }
-
- /**
- * Figures out if a link is an off-site link. This recognizes the most
- * common protocols by checking how it starts.
- */
- private static boolean isExternalLink(String link) {
- return link.startsWith("http:") || link.startsWith("ftp:")
- || link.startsWith("https:") || link.startsWith("mailto:")
- || link.startsWith("news:") || link.startsWith("file:");
- }
-
- /**
- * Cleans a Wiki name.
- * <P>[ This is a link ] -> ThisIsALink
- *
- * @param link
- * Link to be cleared. Null is safe, and causes this to return
- * null.
- * @return A cleaned link.
- *
- * @since 2.0
- */
- public static String cleanLink(String link) {
- StringBuffer clean = new StringBuffer();
-
- if (link == null)
- return null;
-
- //
- // Compress away all whitespace and capitalize
- // all words in between.
- //
-
- StringTokenizer st = new StringTokenizer(link, " -");
-
- while (st.hasMoreTokens()) {
- StringBuffer component = new StringBuffer(st.nextToken());
-
- component.setCharAt(0, Character.toUpperCase(component.charAt(0)));
-
- //
- // We must do this, because otherwise compiling on JDK 1.4 causes
- // a downwards incompatibility to JDK 1.3.
- //
- clean.append(component.toString());
- }
-
- //
- // Remove non-alphanumeric characters that should not
- // be put inside WikiNames. Note that all valid
- // Unicode letters are considered okay for WikiNames.
- // It is the problem of the WikiPageProvider to take
- // care of actually storing that information.
- //
-
- for (int i = 0; i < clean.length(); i++) {
- if (!(Character.isLetterOrDigit(clean.charAt(i))
- || clean.charAt(i) == '_' || clean.charAt(i) == '.')) {
- clean.deleteCharAt(i);
- --i; // We just shortened this buffer.
- }
- }
-
- return clean.toString();
- }
-
-// public static void main(String[] args) {
-// String wikitext = "__Forge Portal__FORGE USER HOW TO:\\\\\n"
-// + "[Add a new project and modify its data|http://www.NewProject.com]\\\\\n"
-// + "[Add and manage project downloads|Project Downloads]\\\\\n"
-// + "[Add and manage project freezone|Project *Freezone]\\\\\n"
-// + "[Project Freezone]\\\\\n"
-// + "[http://www.google.com]\\\\\n";
-// WikiContext wc = new WikiContext();
-//
-// String elements = parseLinks(wikitext, wc);
-//
-// System.out.println(elements);
-// }
-
-}
\ No newline at end of file
|
|
From: <jbo...@li...> - 2005-08-11 19:45:53
|
Author: ral...@jb...
Date: 2005-08-11 15:44:28 -0400 (Thu, 11 Aug 2005)
New Revision: 826
Added:
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiParser.java
Log:
simple version of wiki parser - transforms wiki links to outside or wikipage links
Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiParser.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiParser.java 2005-08-11 19:39:43 UTC (rev 825)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiParser.java 2005-08-11 19:44:28 UTC (rev 826)
@@ -0,0 +1,196 @@
+package org.jboss.wiki.plugins;
+
+/**
+ * @author rali
+ *
+ *
+ */
+import java.util.regex.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.StringTokenizer;
+
+public class WikiParser {
+
+ private static Pattern myPattern;
+
+ private Matcher myMatcher;
+
+ /* URL components, later to be configurable */
+ private static String portalHome = "http://forge.sicore.org:8080/portal/";
+
+ private static String wikiHome = "index.html?ctrl:id=window.default.WikiPortletWindow";
+
+ private static String actionType = "&ctrl:type=";
+
+ private static String page = "&page=";
+
+ public ArrayList mediaPatterns;
+
+ public ArrayList linkPatterns;
+
+ public static String[] textlinks;
+
+ public static String[] notextlinks;
+
+ private String[] mediaFormats = { "*.png", "*.jpeg", "*.gif" };
+
+ public WikiParser() {
+ }
+
+ /*
+ * compile all links to wiki pages or external pages of the form [...] or
+ * [...|...]
+ */
+ public static String parseLinks(String text, String actionURL) {
+ String translatedContent = text;
+ String link;// = "";
+ String href1regex = "\\[.+\\|.+\\]";
+ String href2regex = "\\[.+\\]";
+ Pattern tLinks = Pattern.compile(href1regex);
+ Pattern links = Pattern.compile(href2regex);
+ Matcher textlinks = tLinks.matcher(text);
+ Matcher nontextlinks = links.matcher(text);
+
+ Matcher match;
+
+ while ((match = tLinks.matcher(translatedContent)).find()) {
+ link = (translatedContent.substring(translatedContent.indexOf("|",
+ match.start() + 1) + 1, match.end() - 1)).trim();
+ if (isExternalLink(link)) //outside link
+ {
+ translatedContent = match.replaceFirst("<a href=\""
+ + link
+ + "\">"
+ + translatedContent.substring(match.start() + 1,
+ translatedContent.indexOf("|",
+ match.start() + 1)) + "</a>");
+ } else
+ //need to implement pageExists
+ translatedContent = match.replaceFirst("<a href=\""
+ + portalHome
+ + wikiHome
+ + actionType
+ + "action"
+ + page
+ + cleanLink(link)
+ + "\">"
+ + translatedContent.substring(match.start() + 1,
+ translatedContent.indexOf("|",
+ match.start() + 1)) + "</a>");
+ }
+
+ while ((match = links.matcher(translatedContent)).find()) {
+ link = (translatedContent.substring(match.start() + 1,
+ match.end() - 1));
+ if (isExternalLink(link)) //outside link
+ {
+ translatedContent = match.replaceFirst("<a href=\""
+ + link
+ + "\">"
+ + link + "</a>");
+ }else
+ translatedContent = match.replaceFirst("<a href=\"" + portalHome
+ + wikiHome
+ + actionType
+ + "action"
+ + page
+ + cleanLink(link)
+ + "\">"+ link + "</a>");
+ }
+
+ translatedContent = translatedContent.replace("\n", "<BR>\n");
+
+ return translatedContent;
+ }
+
+ /* a collection of all media formats allowed on wiki */
+ private Collection getImagePatterns() {
+ ArrayList patterns = new ArrayList();
+ for (int i = 0; i < mediaFormats.length; i++) {
+ patterns.add(mediaFormats[i]);
+ }
+
+ return patterns;
+ }
+
+ /**
+ * Figures out if a link is an off-site link. This recognizes the most
+ * common protocols by checking how it starts.
+ */
+ private static boolean isExternalLink(String link) {
+ return link.startsWith("http:") || link.startsWith("ftp:")
+ || link.startsWith("https:") || link.startsWith("mailto:")
+ || link.startsWith("news:") || link.startsWith("file:");
+ }
+
+ /**
+ * Cleans a Wiki name.
+ * <P>[ This is a link ] -> ThisIsALink
+ *
+ * @param link
+ * Link to be cleared. Null is safe, and causes this to return
+ * null.
+ * @return A cleaned link.
+ *
+ * @since 2.0
+ */
+ public static String cleanLink(String link) {
+ StringBuffer clean = new StringBuffer();
+
+ if (link == null)
+ return null;
+
+ //
+ // Compress away all whitespace and capitalize
+ // all words in between.
+ //
+
+ StringTokenizer st = new StringTokenizer(link, " -");
+
+ while (st.hasMoreTokens()) {
+ StringBuffer component = new StringBuffer(st.nextToken());
+
+ component.setCharAt(0, Character.toUpperCase(component.charAt(0)));
+
+ //
+ // We must do this, because otherwise compiling on JDK 1.4 causes
+ // a downwards incompatibility to JDK 1.3.
+ //
+ clean.append(component.toString());
+ }
+
+ //
+ // Remove non-alphanumeric characters that should not
+ // be put inside WikiNames. Note that all valid
+ // Unicode letters are considered okay for WikiNames.
+ // It is the problem of the WikiPageProvider to take
+ // care of actually storing that information.
+ //
+
+ for (int i = 0; i < clean.length(); i++) {
+ if (!(Character.isLetterOrDigit(clean.charAt(i))
+ || clean.charAt(i) == '_' || clean.charAt(i) == '.')) {
+ clean.deleteCharAt(i);
+ --i; // We just shortened this buffer.
+ }
+ }
+
+ return clean.toString();
+ }
+
+// public static void main(String[] args) {
+// String wikitext = "__Forge Portal__FORGE USER HOW TO:\\\\\n"
+// + "[Add a new project and modify its data|http://www.NewProject.com]\\\\\n"
+// + "[Add and manage project downloads|Project Downloads]\\\\\n"
+// + "[Add and manage project freezone|Project *Freezone]\\\\\n"
+// + "[Project Freezone]\\\\\n"
+// + "[http://www.google.com]\\\\\n";
+// WikiContext wc = new WikiContext();
+//
+// String elements = parseLinks(wikitext, wc);
+//
+// System.out.println(elements);
+// }
+
+}
\ No newline at end of file
|
Author: dam...@jb... Date: 2005-08-11 15:39:43 -0400 (Thu, 11 Aug 2005) New Revision: 825 Added: qa/forge/jira-extensions/jira-file-modifications/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/actions.xml qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/entitydefs/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/entitydefs/entitygroup.xml qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/entitydefs/entitymodel.xml qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/votes-assigment-types.xml qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/decorators/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/decorators/admin.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/.bodytop.jsp.swp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/bodytop.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/panels/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/panels/project/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/panels/project/schemes.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/addscheme.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/addvotesassigment.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/deletescheme.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/deletevotesassigment.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/editscheme.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/editvotesassigments.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/viewschemes.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/views/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/views/voting/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/views/voting/selectprojectscheme.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/globalreports.jsp qa/forge/jira-extensions/jira-file-modifications/maven.xml qa/forge/jira-extensions/jira-file-modifications/project.properties qa/forge/jira-extensions/jira-file-modifications/project.xml Removed: qa/forge/jira-extensions/jira-file-modifications/jira-3.2/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/actions.xml qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/entitydefs/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/entitydefs/entitygroup.xml qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/entitydefs/entitymodel.xml qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/votes-assigment-types.xml qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/decorators/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/decorators/admin.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/.bodytop.jsp.swp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/bodytop.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/panels/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/panels/project/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/panels/project/schemes.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/addscheme.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/addvotesassigment.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/deletescheme.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/deletevotesassigment.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/editscheme.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/editvotesassigments.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/viewschemes.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/views/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/views/voting/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/views/voting/selectprojectscheme.jsp qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/globalreports.jsp qa/forge/jira-extensions/jira-file-modifications/maven.xml qa/forge/jira-extensions/jira-file-modifications/project.properties qa/forge/jira-extensions/jira-file-modifications/project.xml qa/forge/jira-extensions/voting/jira-3.0/ qa/forge/jira-extensions/voting/jira-3.1/ qa/forge/jira-extensions/voting/jira-3.2/ Modified: qa/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm qa/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm qa/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm qa/forge/jira-extensions/maven.xml qa/forge/jira-extensions/voting/maven.xml Log: MERGED: -r 803:824 https://svn.labs.jboss.com/trunk/forge/jira-extensions https://svn.labs.jboss.com/qa/forge/jira-extensions Modified: qa/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm =================================================================== --- qa/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm 2005-08-11 19:10:05 UTC (rev 824) +++ qa/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm 2005-08-11 19:39:43 UTC (rev 825) @@ -4,7 +4,7 @@ <table width="100%" border="1" cellspacing="0" cellpadding="0" bordercolor="#aaaaaa"> <tr> - <td rowspan="2" bgcolor="#aaaaaa"><b>User login</b></td><td colspan="$pList.size()" bgcolor="#aaaaaa"><b>Issues per project</b></td><td rowspan="2" bgcolor="#aaaaaa"><b>No of projects</b></td> + <td rowspan="2" bgcolor="#aaaaaa"><b>User login</b></td><td colspan="$pList.size()" bgcolor="#aaaaaa"><b>Issues per project</b></td><td rowspan="2" bgcolor="#aaaaaa"><b>Number of projects</b></td> <tr> #foreach ($pronum in $pList) @@ -27,7 +27,7 @@ #end <br> <table> - <tr><td colspan="2">TopTen Graph - <i>at least one issue per project<br><div style="text-size: small">$activeProj</div></i> </td><td>No of issues</td></tr> + <tr><td colspan="2">TopTen Graph - <i>at least one issue per project<br><div style="text-size: small">$activeProj</div></i> </td><td>Number of issues</td></tr> #foreach ($barKey in $topTenSumUs) <tr> #set($bar = $topTen.get($barKey)) @@ -54,7 +54,7 @@ <br> <table> <tr><td colspan="3">Projects per developer graph</td></tr> - <tr><td colspan="2">User</td><td>No of projects</td></tr> + <tr><td colspan="2">User</td><td>Number of projects</td></tr> #foreach ($key in $sort ) #set($colourIt = $velocityCount % 7) #set($proNum = $sum.get($key) * $GRAPH_MULT) Modified: qa/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm =================================================================== --- qa/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm 2005-08-11 19:10:05 UTC (rev 824) +++ qa/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm 2005-08-11 19:39:43 UTC (rev 825) @@ -4,7 +4,7 @@ <table border="0"> <tr> - <td class="formtitle">Project:</td><td colspan="2" class="formtitle" align="right">No of developers</td> + <td class="formtitle">Project:</td><td colspan="2" class="formtitle" align="right">Number of developers</td> </tr> #foreach( $key in $projectSort ) #set ($width = $developersCount.get($key) * $mult) Modified: qa/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm =================================================================== --- qa/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm 2005-08-11 19:10:05 UTC (rev 824) +++ qa/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm 2005-08-11 19:39:43 UTC (rev 825) @@ -4,7 +4,7 @@ #*<table border="0"> <tr> - <td class="formtitle">Project</td><td class="formtitle">No of issues</td> + <td class="formtitle">Project</td><td class="formtitle">Number of issues</td> </tr> #foreach( $key in $issuesSort ) <tr><td><a href="../secure/BrowseProject.jspa?id=$key">$pNames.get($key)</a></td><td>$issues.get($key)</td></tr> @@ -17,7 +17,7 @@ <table border="0"> ##<tr><td class="formtitle">Graph</td></tr> <tr> - <td class="formtitle">Project</td><td colspan="2" class="formtitle" align="right">No of issues</td> + <td class="formtitle">Project</td><td colspan="2" class="formtitle" align="right">Number of issues</td> </tr> #foreach( $key in $issuesSort ) #set ($width = $issues.get($key) * $mult) Copied: qa/forge/jira-extensions/jira-file-modifications (from rev 824, trunk/forge/jira-extensions/jira-file-modifications) Copied: qa/forge/jira-extensions/jira-file-modifications/jira-3.2 (from rev 824, trunk/forge/jira-extensions/jira-file-modifications/jira-3.2) Copied: qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp (from rev 824, trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp) Copied: qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF (from rev 824, trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF) Copied: qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes (from rev 824, trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes) Deleted: qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/actions.xml =================================================================== --- trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/actions.xml 2005-08-11 19:10:05 UTC (rev 824) +++ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/actions.xml 2005-08-11 19:39:43 UTC (rev 825) @@ -1,2158 +0,0 @@ -<!-- Actions for the JIRA Web Application --> -<actions> - - <!-- Entity Administration --> - <action name="user.Logout" alias="Logout"> - <view name="error">/logoutconfirm.jsp</view> - <view name="confirm">/logoutconfirm.jsp</view> - <view name="logout">/logout.jsp</view> - </action> - - <action name="project.AddProject" alias="AddProject" roles-required="admin"> - <view name="error">/secure/admin/views/addproject.jsp</view> - <view name="input">/secure/admin/views/addproject.jsp</view> - </action> - - <action name="project.DeleteProject" alias="DeleteProject" roles-required="admin"> - <view name="success">/secure/admin/default.jsp</view> - <view name="error">/secure/admin/views/deleteprojectconfirm.jsp</view> - <view name="input">/secure/admin/views/deleteprojectconfirm.jsp</view> - </action> - - <action name="admin.notification.SelectProjectScheme" alias="SelectProjectScheme" roles-required="admin"> - <view name="success">/secure/project/views/notifications/selectprojectscheme.jsp</view> - <view name="input">/secure/project/views/notifications/selectprojectscheme.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="admin.workflow.scheme.SelectProjectWorkflowScheme" alias="SelectProjectWorkflowScheme" roles-required="admin"> - <view name="input">/secure/project/views/workflows/selectprojectscheme.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="admin.workflow.scheme.SelectProjectWorkflowSchemeStep2" alias="SelectProjectWorkflowSchemeStep2" roles-required="admin"> - <view name="success">/secure/project/views/workflows/selectprojectschemestep2.jsp</view> - <view name="error">/secure/project/views/workflows/selectprojectschemestep2.jsp</view> - <view name="input">/secure/project/views/workflows/selectprojectschemestep2.jsp</view> - <view name="workflowmigrationerror">/secure/views/workflowmigrationerror.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.SelectProjectCategory" alias="SelectProjectCategory" roles-required="admin"> - <view name="success">/secure/project/views/selectprojectcategory.jsp</view> - <view name="input">/secure/project/views/selectprojectcategory.jsp</view> - </action> - - <action name="admin.permission.SelectProjectPermissionScheme" alias="SelectProjectPermissionScheme" roles-required="admin"> - <view name="success">/secure/project/views/permissions/selectprojectpermissionscheme.jsp</view> - <view name="input">/secure/project/views/permissions/selectprojectpermissionscheme.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="admin.issuesecurity.SelectProjectIssueSecurityScheme" alias="SelectProjectIssueSecurityScheme" roles-required="admin"> - <view name="success">/secure/project/views/issuesecurity/selectprojectissuesecurityscheme.jsp</view> - <view name="input">/secure/project/views/issuesecurity/selectprojectissuesecurityscheme.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="admin.workflow.ActivateWorkflow" alias="ActivateWorkflow" roles-required="admin"> - <view name="workflowmigrationerror">/secure/views/workflowmigrationerror.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <!-- User Administration --> - <action name="admin.user.GroupBrowser" alias="GroupBrowser" roles-required="admin"> - <view name="success">/secure/admin/user/views/groupbrowser.jsp</view> - </action> - - <action name="admin.user.ViewGroup" alias="ViewGroup" roles-required="admin"> - <view name="success">/secure/admin/user/views/viewgroup.jsp</view> - </action> - - <action name="admin.user.DeleteGroup" alias="DeleteGroup" roles-required="admin"> - <view name="error">/secure/admin/user/views/deletegroupconfirm.jsp</view> - <view name="input">/secure/admin/user/views/deletegroupconfirm.jsp</view> - </action> - - <action name="admin.user.UserBrowser" alias="UserBrowser" roles-required="admin"> - <view name="success">/secure/admin/user/views/userbrowser.jsp</view> - </action> - - <action name="admin.user.UserPickerBrowser" alias="UserPickerBrowser" roles-required="pickusers"> - <view name="success">/secure/popups/userpicker.jsp</view> - <view name="input">/secure/popups/userpicker.jsp</view> - </action> - - <action name="issue.navigator.DueDatePicker" alias="DueDatePicker"> - <view name="open">/secure/popups/duedatepicker.jsp</view> - </action> - - <action name="admin.IconPicker" alias="IconPicker"> - <view name="error">/secure/popups/iconpicker.jsp</view> - <view name="success">/secure/popups/iconpicker.jsp</view> - </action> - - <action name="admin.user.AddUser" alias="AddUser" roles-required="admin"> - <view name="error">/secure/admin/user/views/adduser.jsp</view> - <view name="input">/secure/admin/user/views/adduser.jsp</view> - </action> - - <action name="admin.user.ViewUser" alias="ViewUser" roles-required="admin"> - <view name="success">/secure/admin/user/views/viewuser.jsp</view> - <view name="error">/secure/admin/user/views/viewuser.jsp</view> - </action> - - <action name="admin.user.EditUser" alias="EditUser" roles-required="admin"> - <view name="error">/secure/admin/user/views/editprofile.jsp</view> - <view name="input">/secure/admin/user/views/editprofile.jsp</view> - </action> - - <action name="admin.user.EditUserGroups" alias="EditUserGroups" roles-required="admin"> - <view name="error">/secure/admin/user/views/editusergroups.jsp</view> - <view name="success">/secure/admin/user/views/editusergroups.jsp</view> - </action> - - <action name="admin.user.DeleteUser" alias="DeleteUser" roles-required="admin"> - <view name="error">/secure/admin/user/views/deleteuserconfirm.jsp</view> - <view name="input">/secure/admin/user/views/deleteuserconfirm.jsp</view> - </action> - - <action name="admin.user.SetPassword" alias="SetPassword" roles-required="admin"> - <view name="error">/secure/admin/user/views/setpassword.jsp</view> - <view name="input">/secure/admin/user/views/setpassword.jsp</view> - </action> - - <action name="project.EditVersionDetails" alias="EditVersionDetails"> - <view name="success">/secure/project/views/editversiondetails.jsp</view> - <view name="error">/secure/project/views/editversiondetails.jsp</view> - <view name="input">/secure/project/views/editversiondetails.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <!-- Project administration --> - <action name="project.ViewProjects" alias="ViewProjects"> - <view name="success">/secure/project/views/viewprojects.jsp</view> - </action> - - <action name="project.ViewProject" alias="ViewProject"> - <view name="input">/secure/project/views/viewprojecterror.jsp</view> - <view name="success">/secure/project/views/viewproject.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.EditProject" alias="EditProject"> - <view name="success">/secure/project/views/editproject.jsp</view> - <view name="error">/secure/project/views/editproject.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.AddComponent" alias="AddComponent"> - <view name="success">/secure/project/views/addcomponent.jsp</view> - <view name="error">/secure/project/views/addcomponent.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.DeleteComponent" alias="DeleteComponent"> - <view name="success">/secure/project/views/deletecomponentconfirm.jsp</view> - <view name="error">/secure/project/views/deletecomponentconfirm.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.EditComponent" alias="EditComponent"> - <view name="success">/secure/project/views/editcomponent.jsp</view> - <view name="error">/secure/project/views/editcomponent.jsp</view> - <view name="input">/secure/project/views/editcomponent.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.enterprise.SelectComponentAssignees" alias="SelectComponentAssignees"> - <view name="error">/secure/project/views/select_componentassignees.jsp</view> - <view name="input">/secure/project/views/select_componentassignees.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.ManageVersions" alias="ManageVersions"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - <command name="moveUp" alias="VersionUp"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="error">/secure/project/views/manageversions.jsp</view> - </command> - <command name="moveDown" alias="VersionDown"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="error">/secure/project/views/manageversions.jsp</view> - </command> - <command name="moveFirst" alias="VersionFirst"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="error">/secure/project/views/manageversions.jsp</view> - </command> - <command name="moveLast" alias="VersionLast"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="error">/secure/project/views/manageversions.jsp</view> - </command> - </action> - - <action name="project.AddVersion" alias="AddVersion"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="error">/secure/project/views/manageversions.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.EditVersionReleaseDate" alias="EditVersionReleaseDate"> - <view name="success">/secure/project/views/editversionreleasedate.jsp</view> - <view name="error">/secure/project/views/editversionreleasedate.jsp</view> - <view name="input">/secure/project/views/editversionreleasedate.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.EditVersionReleases" alias="EditVersionReleases"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="input">/secure/project/views/checkversionreleases.jsp</view> - <view name="checkrelease">/secure/project/views/checkversionreleases.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.EditVersionArchives" alias="EditVersionArchives"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.MergeVersions" alias="MergeVersions"> - <view name="success">/secure/project/views/mergeversionconfirm.jsp</view> - <view name="input">/secure/project/views/mergeversionselect.jsp</view> - <view name="error">/secure/project/views/mergeversionselect.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - <command name="merge" alias="Merge"> - <view name="error">/secure/project/views/mergeversionselect.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </command> - </action> - - <action name="project.RescheduleVersions" alias="RescheduleVersions"> - <view name="success">/secure/project/views/rescheduleversions.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.DeleteVersion" alias="DeleteVersion"> - <view name="success">/secure/project/views/deleteversionconfirm.jsp</view> - <view name="error">/secure/project/views/deleteversionconfirm.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <!--ProjectCategory Actions--> - <action name="projectcategory.AddProjectCategory" alias="ViewProjectCategories" roles-required="admin"> - <view name="success">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> - <view name="input">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> - <view name="error">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> - </action> - - <action name="projectcategory.AddProjectCategory" alias="AddProjectCategory" roles-required="admin"> - <view name="input">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> - <view name="error">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> - </action> - - <action name="projectcategory.EditProjectCategory" alias="EditProjectCategory" roles-required="admin"> - <view name="input">/secure/admin/views/projectcategory/editprojectcategory.jsp</view> - <view name="error">/secure/admin/views/projectcategory/editprojectcategory.jsp</view> - </action> - - <action name="projectcategory.DeleteProjectCategory" alias="DeleteProjectCategory" roles-required="admin"> - <view name="input">/secure/admin/views/projectcategory/deleteprojectcategoryconfirm.jsp</view> - <view name="error">/secure/admin/views/projectcategory/deleteprojectcategoryconfirm.jsp</view> - </action> - - <!-- Utility Actions --> - <action name="util.ExportAll" alias="XmlBackup" roles-required="admin"> - <view name="success">/secure/admin/views/exportall_result.jsp</view> - <view name="error">/secure/admin/views/exportall_options.jsp</view> - <view name="confirm">/secure/admin/views/exportall_confirm.jsp</view> - <view name="fixchars">/secure/admin/views/exportall_fixchars.jsp</view> - <view name="input">/secure/admin/views/exportall_options.jsp</view> - </action> - - <action name="util.ImportAll" alias="XmlRestore" roles-required="admin"> - <view name="success">/secure/admin/views/importall_result.jsp</view> - <view name="error">/secure/admin/views/importall_options.jsp</view> - <view name="input">/secure/admin/views/importall_options.jsp</view> - </action> - - <!-- The security check is built into this action, as the user is not loged in - when it is called. --> - <action name="util.CleanData" alias="CleanData"> - <view name="success">/views/cleandatabase.jsp</view> - <view name="error">/views/cleandatabase.jsp</view> - </action> - <action name="util.LDAPConfigurer" alias="LDAPConfigurer"> - <view name="success">/views/ldapconfigurer_result.jsp</view> - <view name="error">/views/ldapconfigurer.jsp</view> - </action> - - <action name="util.BugzillaImport" alias="BugzillaImport" roles-required="admin"> - <view name="input">/secure/admin/views/bugzillaimport/bugzilla_connect.jsp</view> - <view name="success">/secure/admin/views/bugzillaimport/bugzilla_select.jsp</view> - <view name="error">/secure/admin/views/bugzillaimport/bugzilla_connect.jsp</view> - - <view name="monitor">/secure/admin/views/bugzillaimport/bugzilla_monitor.jsp?decorator=none</view> - - <command name="setProjectDefaults" alias="BugzillaSetProjectDefaults"> - <view name="choosemappings">/secure/admin/views/bugzillaimport/bugzilla_choosemappings.jsp</view> - </command> - - <command name="run" alias="BugzillaRun"> - <view name="success">/secure/admin/views/bugzillaimport/bugzilla_run.jsp</view> - <view name="input">/secure/admin/views/bugzillaimport/bugzilla_choosemappings.jsp</view> - <view name="error">/secure/admin/views/bugzillaimport/bugzilla_select.jsp</view> - </command> - - </action> - <action name="util.MantisImport" alias="MantisImport" roles-required="admin"> - <view name="input">/secure/admin/views/mantisimport/mantis_connect.jsp</view> - <view name="success">/secure/admin/views/mantisimport/mantis_select.jsp</view> - <view name="error">/secure/admin/views/mantisimport/mantis_connect.jsp</view> - - <view name="monitor">/secure/admin/views/mantisimport/mantis_monitor.jsp?decorator=none</view> - - <command name="setProjectDefaults" alias="MantisSetProjectDefaults"> - <view name="choosemappings">/secure/admin/views/mantisimport/mantis_choosemappings.jsp</view> - </command> - - <command name="run" alias="MantisRun"> - <view name="success">/secure/admin/views/mantisimport/mantis_run.jsp</view> - <view name="input">/secure/admin/views/mantisimport/mantis_choosemappings.jsp</view> - <view name="error">/secure/admin/views/mantisimport/mantis_select.jsp</view> - </command> - </action> - - <action name="util.TestTrackProXMLImport" alias="TestTrackProXMLImport" roles-required="admin"> - <view name="input">/secure/admin/views/testtrackproimport/testtrackpro_xmlimport.jsp</view> - <view name="success">/secure/admin/views/testtrackproimport/testtrackpro_xmlimport.jsp</view> - </action> - - <action name="util.CsvImporter" alias="CsvImport" roles-required="admin"> - <view name="error">/secure/admin/views/importers/csv/csvimport.jsp</view> - <view name="input">/secure/admin/views/importers/csv/csvimport.jsp</view> - <view name="settings">/secure/admin/views/importers/csv/importsettings.jsp</view> - <view name="logs">/secure/admin/views/importers/csv/viewlogs.jsp</view> - <view name="finished">/secure/admin/views/importers/csv/finishedimport.jsp</view> - <view name="success">/secure/admin/views/importers/csv/csvimport.jsp</view> - </action> - - <action name="util.csv.ConfigureCsvMapping" alias="ConfigureCsvMapping" roles-required="admin"> - <view name="error">/secure/admin/views/importers/csv/csvconfig.jsp</view> - <view name="input">/secure/admin/views/importers/csv/csvconfig.jsp</view> - <view name="1">/secure/admin/views/importers/csv/configproject.jsp</view> - <view name="2">/secure/admin/views/importers/csv/configissuemapping.jsp</view> - <view name="3">/secure/admin/views/importers/csv/configvaluemapping.jsp</view> - <view name="5">/secure/admin/views/importers/csv/savepropertiesfile.jsp</view> - <view name="4">/secure/admin/views/importers/csv/configdateuserdefaults.jsp</view> - <view name="success">/secure/admin/views/importers/csv/csvimport.jsp</view> - <view name="importwithoutsaving">CsvImport!settings.jspa</view> - </action> - - <!-- <action name="util.IdsImporter" alias="IdsImport" roles-required="admin">--> - <!-- <view name="input">/secure/admin/views/importers/importcsv.jsp</view>--> - <!-- <view name="success">/secure/admin/views/importers/importcsv.jsp</view>--> - <!-- </action>--> - <!-- <action name="util.XmlImporter" alias="XmlImport" roles-required="admin">--> - <!-- <view name="input">/secure/admin/views/importers/xmlimport.jsp</view>--> - <!-- <view name="success">/secure/admin/views/importers/xmlimport.jsp</view>--> - <!-- </action>--> - - <action name="util.ShowConstantsHelp" alias="ShowConstantsHelp" roles-required="use"> - <view name="success">/secure/showconstantshelp.jsp</view> - </action> - - <action name="util.JellyRunner" alias="JellyRunner" roles-required="admin"> - <view name="input">/secure/admin/views/jelly_runner.jsp</view> - <view name="error">/secure/admin/views/jelly_runner.jsp</view> - <view name="success">/secure/admin/views/jelly_result.jsp</view> - </action> - - <!-- JIRA Administration --> - <action name="admin.ViewPlugins" alias="ViewPlugins" roles-required="admin"> - <view name="input">/secure/admin/views/plugins/viewplugins.jsp</view> - <view name="success">/secure/admin/views/plugins/viewplugins.jsp</view> - </action> - - <action name="admin.ViewListeners" alias="ViewListeners" roles-required="admin"> - <view name="input">/secure/admin/views/listeners/viewlisteners.jsp</view> - <view name="success">/secure/admin/views/listeners/viewlisteners.jsp</view> - </action> - - <action name="admin.EditListener" alias="EditListener" roles-required="admin"> - <view name="input">/secure/admin/views/listeners/editlistener.jsp</view> - <view name="error">/secure/admin/views/listeners/editlistener.jsp</view> - </action> - - <action name="admin.ViewServices" alias="ViewServices" roles-required="admin"> - <view name="input">/secure/admin/views/services/viewservices.jsp</view> - <view name="success">/secure/admin/views/services/viewservices.jsp</view> - </action> - - <action name="admin.EditService" alias="EditService" roles-required="admin"> - <view name="input">/secure/admin/views/services/editservice.jsp</view> - <view name="error">/secure/admin/views/services/editservice.jsp</view> - </action> - - <action name="admin.linking.ViewLinkTypes" alias="ViewLinkTypes" roles-required="admin"> - <view name="input">/secure/admin/jira/views/viewlinktypes.jsp</view> - <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view> - <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view> - - <command name="activate" alias="IssueLinkingActivate"> - <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view> - <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view> - </command> - <command name="deactivate" alias="IssueLinkingDeActivate"> - <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view> - <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view> - </command> - </action> - - <action name="admin.linking.EditLinkType" alias="EditLinkType" roles-required="admin"> - <view name="input">/secure/admin/jira/views/editlinktype.jsp</view> - <view name="error">/secure/admin/jira/views/editlinktype.jsp</view> - </action> - - <action name="admin.linking.DeleteLinkType" alias="DeleteLinkType" roles-required="admin"> - <view name="input">/secure/admin/jira/views/deletelinktype.jsp</view> - <view name="error">/secure/admin/jira/views/deletelinktype.jsp</view> - </action> - - <action name="admin.ViewApplicationProperties" alias="ViewApplicationProperties" roles-required="admin"> - <view name="success">/secure/admin/jira/views/applicationproperties.jsp</view> - </action> - - <action name="admin.ViewAttachmentSettings" alias="ViewAttachmentSettings" roles-required="admin"> - <view name="success">/secure/admin/jira/views/attachments.jsp</view> - </action> - - <action name="admin.SchedulerAdmin" alias="SchedulerAdmin" roles-required="admin"> - <view name="success">/secure/admin/jira/views/scheduleradmin.jsp</view> - </action> - - <action name="admin.MailQueueAdmin" alias="MailQueueAdmin" roles-required="admin"> - <view name="input">/secure/admin/jira/views/mailqueueadmin.jsp</view> - <view name="success">/secure/admin/jira/views/mailqueueadmin.jsp</view> - </action> - - <action name="admin.IndexAdminImpl" alias="IndexAdmin" roles-required="admin"> - <view name="success">/secure/admin/jira/views/indexing.jsp</view> - <view name="error">/secure/admin/jira/views/indexing.jsp</view> - - <command name="reindex" alias="IndexReIndex"> - <view name="success">/secure/admin/jira/views/indexing.jsp</view> - <view name="error">/secure/admin/jira/views/indexing.jsp</view> - </command> - <command name="activate" alias="IndexActivate"> - <view name="success">/secure/admin/jira/views/indexing.jsp</view> - <view name="error">/secure/admin/jira/views/indexing.jsp</view> - </command> - <command name="deactivate" alias="IndexDeActivate"> - <view name="success">/secure/admin/jira/views/indexing.jsp</view> - <view name="error">/secure/admin/jira/views/indexing.jsp</view> - </command> - </action> - - <action name="admin.TimeTrackingAdmin" alias="TimeTrackingAdmin" roles-required="admin"> - <view name="success">/secure/admin/jira/views/timetracking.jsp</view> - <view name="error">/secure/admin/jira/views/timetracking.jsp</view> - - <command name="activate" alias="TimeTrackingActivate"> - <view name="success">/secure/admin/jira/views/timetracking.jsp</view> - <view name="error">/secure/admin/jira/views/timetracking.jsp</view> - </command> - <command name="deactivate" alias="TimeTrackingDeActivate"> - <view name="success">/secure/admin/jira/views/timetracking.jsp</view> - <view name="error">/secure/admin/jira/views/timetracking.jsp</view> - </command> - </action> - - <action name="admin.TrackbackAdmin" alias="TrackbackAdmin" roles-required="admin"> - <view name="success">/secure/admin/jira/views/trackback.jsp</view> - <view name="input">/secure/admin/jira/views/edittrackback.jsp</view> - <view name="error">/secure/admin/jira/views/edittrackback.jsp</view> - - <command name="activate" alias="TrackbackActivate"> - <view name="success">/secure/admin/jira/views/trackback.jsp</view> - <view name="error">/secure/admin/jira/views/trackback.jsp</view> - </command> - <command name="deactivate" alias="TrackbackDeActivate"> - <view name="success">/secure/admin/jira/views/trackback.jsp</view> - <view name="error">/secure/admin/jira/views/trackback.jsp</view> - </command> - </action> - - <action name="admin.ConfigureDefaultPortal" alias="EditDefaultDashboard" roles-required="admin"> - <view name="input">/secure/admin/views/editdefaultdashboardconfig.jsp</view> - <view name="error">/secure/admin/views/editdefaultdashboardconfig.jsp</view> - </action> - - <action name="admin.AddDefaultPortlet" alias="AddDefaultPortlet" roles-required="admin"> - <view name="error">/secure/admin/views/editdefaultdashboardconfig.jsp</view> - <view name="input">/secure/admin/views/adddefaultportlet.jsp</view> - </action> - - <action name="admin.SaveDefaultConfiguration" alias="SaveDefaultPortlet" roles-required="admin"> - <view name="input">/secure/admin/views/configuredefaultportlet.jsp</view> - </action> - - <action name="admin.ViewLicense" alias="ViewLicense" roles-required="admin"> - <view name="success">/secure/admin/jira/views/viewlicense.jsp</view> - <view name="input">/secure/admin/jira/views/viewlicense.jsp</view> - <view name="error">/secure/admin/jira/views/viewlicense.jsp</view> - <view name="oldlicense">/secure/errors.jsp</view> - </action> - - <action name="admin.EditApplicationProperties" alias="EditApplicationProperties" roles-required="admin"> - <view name="error">/secure/admin/jira/views/editapplicationproperties.jsp</view> - <view name="input">/secure/admin/jira/views/editapplicationproperties.jsp</view> - </action> - - <action name="admin.EditAttachmentSettings" alias="EditAttachmentSettings" roles-required="admin"> - <view name="error">/secure/admin/jira/views/editattachmentsettings.jsp</view> - <view name="input">/secure/admin/jira/views/editattachmentsettings.jsp</view> - </action> - - <action name="admin.GlobalPermissions" alias="GlobalPermissions" roles-required="admin"> - <view name="success">/secure/admin/jira/views/globalpermissions.jsp</view> - <view name="error">/secure/admin/jira/views/globalpermissions.jsp</view> - </action> - - <action name="admin.ViewLookAndFeel" alias="ViewLookAndFeel" roles-required="admin"> - <view name="success">/secure/admin/jira/views/lookandfeel.jsp</view> - </action> - - <action name="admin.EditLookAndFeel" alias="EditLookAndFeel" roles-required="admin"> - <view name="input">/secure/admin/jira/views/editlookandfeel.jsp</view> - <view name="error">/secure/admin/jira/views/editlookandfeel.jsp</view> - </action> - - <action name="admin.ConfigureIssueCache" alias="ConfigureCache" roles-required="admin"> - <command name="viewCacheConfig" alias="ViewCacheConfig"> - <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view> - </command> - <command name="flushCache" alias="FlushIssueCache"> - <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view> - </command> - <command name="chooseCacheCapacity" alias="ChooseCacheCapacity"> - <view name="input">/secure/admin/views/editcacheconfiguration.jsp</view> - </command> - <command name="flushStats" alias="ResetCacheStats"> - <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view> - </command> - <command name="setCacheCapacity" alias="SetCacheCapacity"> - <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view> - <view name="error">/secure/admin/views/editcacheconfiguration.jsp</view> - </command> - </action> - - <action name="admin.ViewSystemInfo" alias="ViewSystemInfo" roles-required="admin"> - <view name="success">/secure/admin/jira/views/systeminfo.jsp</view> - </action> - - <action name="admin.JiraSupportRequest" alias="JiraSupportRequest" roles-required="admin"> - <view name="input">/secure/admin/jira/views/jirasupportrequest.jsp</view> - <view name="success">/secure/admin/jira/views/jirasupportrequest.jsp</view> - </action> - - <action name="admin.SetupLicense" alias="SetupLicense"> - <view name="success">/views/setuplicense.jsp</view> - <view name="error">/views/setuplicense.jsp</view> - </action> - - <action name="admin.ConfirmNewInstallationWithOldLicense" alias="ConfirmNewInstallationWithOldLicense"> - <view name="success">/views/confirmnewinstallationwitholdlicense.jsp</view> - <view name="error">/views/confirmnewinstallationwitholdlicense.jsp</view> - </action> - - <!-- Constants Administration --> - <action name="admin.priorities.ViewPriorities" alias="ViewPriorities" roles-required="admin"> - <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view> - <command name="addPriority" alias="AddPriority"> - <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view> - <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view> - </command> - <command name="moveDown" alias="PriorityDown"> - <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view> - <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view> - </command> - <command name="moveUp" alias="PriorityUp"> - <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view> - <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view> - </command> - <command name="makeDefault" alias="MakeDefaultPriority"> - <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view> - <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view> - </command> - </action> - - <action name="admin.priorities.EditPriority" alias="EditPriority" roles-required="admin"> - <view name="input">/secure/admin/views/priorities/editpriority.jsp</view> - <view name="error">/secure/admin/views/priorities/editpriority.jsp</view> - </action> - - <action name="admin.priorities.DeletePriority" alias="DeletePriority" roles-required="admin"> - <view name="input">/secure/admin/views/priorities/deletepriority.jsp</view> - <view name="error">/secure/admin/views/priorities/deletepriority.jsp</view> - </action> - - <action name="admin.resolutions.ViewResolutions" alias="ViewResolutions" roles-required="admin"> - <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view> - <command name="addConstant" alias="AddResolution"> - <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view> - <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view> - </command> - <command name="moveDown" alias="ResolutionDown"> - <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view> - <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view> - </command> - <command name="moveUp" alias="ResolutionUp"> - <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view> - <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view> - </command> - <command name="makeDefault" alias="MakeDefaultResolution"> - <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view> - <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view> - </command> - </action> - - <action name="admin.resolutions.EditResolution" alias="EditResolution" roles-required="admin"> - <view name="input">/secure/admin/views/resolutions/editresolution.jsp</view> - <view name="error">/secure/admin/views/resolutions/editresolution.jsp</view> - </action> - - <action name="admin.resolutions.DeleteResolution" alias="DeleteResolution" roles-required="admin"> - <view name="input">/secure/admin/views/resolutions/deleteresolution.jsp</view> - <view name="error">/secure/admin/views/resolutions/deleteresolution.jsp</view> - </action> - - <action name="admin.issuefields.ViewIssueFields" alias="ViewIssueFields" roles-required="admin"> - <view name="success">/secure/admin/views/viewissuefields.jsp</view> - <command name="moveDown" alias="IssueFieldDown"> - <view name="success">/secure/admin/views/viewissuefields.jsp</view> - <view name="error">/secure/admin/views/viewissuefields.jsp</view> - </command> - <command name="moveUp" alias="IssueFieldUp"> - <view name="success">/secure/admin/views/viewissuefields.jsp</view> - <view name="error">/secure/admin/views/viewissuefields.jsp</view> - </command> - <command name="hide" alias="IssueFieldHide"> - <view name="success">/secure/admin/views/viewissuefields.jsp</view> - <view name="error">/secure/admin/views/viewissuefields.jsp</view> - </command> - <command name="require" alias="IssueFieldRequire"> - <view name="success">/secure/admin/views/viewissuefields.jsp</view> - <view name="error">/secure/admin/views/viewissuefields.jsp</view> - </command> - <command name="restoreDefaults" alias="RestoreDefaults"> - <view name="success">/secure/admin/views/viewissuefields.jsp</view> - <view name="error">/secure/admin/views/viewissuefields.jsp</view> - </command> - </action> - - <action name="admin.issuefields.EditDefaultFieldLayoutItem" alias="EditDefaultFieldLayoutItem" roles-required="admin"> - <view name="input">/secure/admin/views/issuefields/editdefaultfieldlayoutitem.jsp</view> - <view name="error">/secure/admin/views/issuefields/editdefaultfieldlayoutitem.jsp</view> - </action> - - <action name="admin.issuefields.enterprise.ViewSchemes" alias="ViewFieldLayoutSchemes" roles-required="admin"> - <view name="success">/secure/admin/views/issuefields/viewfieldlayoutschemes.jsp</view> - - <command name="addScheme" alias="AddFieldLayoutScheme"> - <view name="error">/secure/admin/views/issuefields/viewfieldlayoutschemes.jsp</view> - </command> - </action> - - <action name="admin.issuefields.enterprise.EditFieldLayoutScheme" alias="EditFieldLayoutScheme" roles-required="admin"> - <view name="input">/secure/admin/views/issuefields/editfieldlayoutscheme.jsp</view> - <view name="error">/secure/admin/views/issuefields/editfieldlayoutscheme.jsp</view> - - <command name="deleteScheme" alias="DeleteFieldLayoutScheme"> - <view name="confirm">/secure/admin/views/issuefields/deletefieldlayoutscheme.jsp</view> - <view name="error">/secure/admin/views/issuefields/deletefieldlayoutscheme.jsp</view> - </command> - </action> - - <action name="admin.issuefields.enterprise.CopyFieldLayoutScheme" alias="CopyFieldLayoutScheme" roles-required="admin"> - <view name="input">/secure/admin/views/issuefields/copyfieldlayoutscheme.jsp</view> - <view name="error">/secure/admin/views/issuefields/copyfieldlayoutscheme.jsp</view> - </action> - - <action name="admin.issuefields.enterprise.ConfigureFieldLayoutScheme" alias="ConfigureFieldLayoutScheme" roles-required="admin"> - <view name="error">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view> - <view name="success">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view> - - <command name="addFieldLayoutSchemeEntity" alias="AddFieldLayoutSchemeEntity"> - <view name="error">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view> - </command> - - <command name="deleteFieldLayoutSchemeEntity" alias="DeleteFieldLayoutSchemeEntity"> - <view name="error">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view> - </command> - - <command name="editFieldLayoutSchemeEntity" alias="EditFieldLayoutSchemeEntity"> - <view name="input">/secure/admin/views/issuefields/editfieldlayoutschemeentity.jsp</view> - <view name="error">/secure/admin/views/issuefields/editfieldlayoutschemeentity.jsp</view> - </command> - </action> - - <action name="admin.issuefields.enterprise.SelectFieldLayoutScheme" alias="SelectFieldLayoutScheme" roles-required="admin"> - <view name="input">/secure/project/views/issuefields/selectfieldlayoutscheme.jsp</view> - <view name="error">/secure/project/views/issuefields/selectfieldlayoutscheme.jsp</view> - </action> - - <action name="admin.issuefields.enterprise.ViewFieldLayouts" alias="ViewFieldLayouts" roles-required="admin"> - <view name="success">/secure/admin/views/issuefields/viewfieldlayouts.jsp</view> - - <command name="addFieldLayout" alias="AddFieldLayout"> - <view name="error">/secure/admin/views/issuefields/viewfieldlayouts.jsp</view> - </command> - - <command name="deleteFieldLayout" alias="DeleteFieldLayout"> - <view name="confirm">/secure/admin/views/issuefields/confirmdeletefieldlayout.jsp</view> - <view name="error">/secure/admin/views/issuefields/confirmdeletefieldlayout.jsp</view> - </command> - </action> - - <action name="admin.issuefields.enterprise.EditFieldLayout" alias="EditFieldLayout" roles-required="admin"> - <view name="input">/secure/admin/views/issuefields/editfieldlayout.jsp</view> - <view name="error">/secure/admin/views/issuefields/editfieldlayout.jsp</view> - </action> - - <action name="admin.issuefields.enterprise.CopyFieldLayout" alias="CopyFieldLayout" roles-required="admin"> - <view name="input">/secure/admin/views/issuefields/copyfieldlayout.jsp</view> - <view name="error">/secure/admin/views/issuefields/copyfieldlayout.jsp</view> - </action> - - <action name="admin.issuefields.enterprise.ConfigureFieldLayout" alias="ConfigureFieldLayout" roles-required="admin"> - <view name="input">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - <command name="moveDown" alias="EditFieldLayoutDown"> - <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - </command> - <command name="moveUp" alias="EditFieldLayoutUp"> - <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - </command> - <command name="hide" alias="EditFieldLayoutHide"> - <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - </command> - <command name="require" alias="EditFieldLayoutRequire"> - <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - </command> - <command name="restoreDefaults" alias="EditFieldLayoutRestoreDefaults"> - <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> - </command> - </action> - - <action name="admin.issuefields.enterprise.EditFieldLayoutItem" alias="EditFieldLayoutItem" roles-required="admin"> - <view name="input">/secure/admin/views/issuefields/editfieldlayoutitem.jsp</view> - <view name="error">/secure/admin/views/issuefields/editfieldlayoutitem.jsp</view> - </action> - - <!-- Field Screens --> - <action name="admin.issuefields.screens.ViewFieldScreens" alias="ViewFieldScreens" roles-required="admin"> - <view name="error">/secure/admin/views/issuefields/screens/viewfieldscreens.jsp</view> - <view name="success">/secure/admin/views/issuefields/screens/viewfieldscreens.jsp</view> - - <command name="addFieldScreen" alias="AddFieldScreen"> - <view name="error">/secure/admin/views/issuefields/screens/viewfieldscreens.jsp</view> - </command> - - <command name="deleteFieldScreen" alias="DeleteFieldScreen"> - <view name="confirm">/secure/admin/views/issuefields/screens/confirmdeletefieldscreen.jsp</view> - <view name="error">/secure/admin/views/issuefields/screens/confirmdeletefieldscreen.jsp</view> - </command> - </action> - - <action name="admin.issuefields.screens.EditFieldScreen" alias="EditFieldScreen" roles-required="admin"> - <view name="input">/secure/admin/views/issuefields/screens/editfieldscreen.jsp</view> - <view name="error">/secure/admin/views/issuefields/screens/editfieldscreen.jsp</view> - - <command name="copyFieldScreen" alias="CopyFieldScreen"> - <view name="input">/secure/admin/views/issuefields/screens/copyfieldscreen.jsp</view> - <view name="error">/secure/admin/views/issuefields/screens/copyfieldscreen.jsp</view> - </command> - </action> - - <action name="admin.issuefields.screens.AssociateFieldToScreens" alias="AssociateFieldToScreens" roles-required="admin"> - <view name="input">/secure/admin/views/issuefields/screens/associatefield.jsp</view> - <view name="error">/secure/admin/views/issuefields/screens/associatefield.jsp</view> - </action> - - <action name="admin.issuefields.screens.ConfigureFieldScreen" alias="ConfigureFieldScreen" roles-required="admin"> - <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> - <view name="success">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> - - <command name="deleteField" alias="DeleteFieldScreenLayoutItem"> - <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> - </command> - - <command name="addField" alias="AddFieldScreenLayoutItem"> - <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> - </command> - - <command name="addTab" alias="AddFieldScreenTab"> - <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> - </command> - - <command name="deleteTab" alias="DeleteFieldScreenTab"> - <view name="confirm">/secure/admin/views/issuefields/screens/confirmdeletefieldscreentab.jsp</view> - <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> - </command> - - <command name="moveLayoutItemFirst" alias="FieldScreenLayoutItemFirst"> - <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> - </command> - - <command name="moveLayoutItemUp" alias="FieldScreenLayoutItemUp"> - <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> - </command> - - <command name="moveLayoutItemDown" alias="FieldScreenLayoutItemDown"> - <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> - </command> - - <command name="moveLayoutItemLast" alias="FieldScreenLayoutItemLast"> - <view name="error">/secure/admin/vie... [truncated message content] |
|
From: <jbo...@li...> - 2005-08-11 19:11:24
|
Author: adamw
Date: 2005-08-11 15:10:05 -0400 (Thu, 11 Aug 2005)
New Revision: 824
Removed:
trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/.globalreports.jsp.swp
Modified:
trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/globalreports.jsp
Log:
Corrections
Deleted: trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/.globalreports.jsp.swp
===================================================================
(Binary files differ)
Modified: trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/globalreports.jsp
===================================================================
--- trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/globalreports.jsp 2005-08-11 19:05:19 UTC (rev 823)
+++ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/globalreports.jsp 2005-08-11 19:10:05 UTC (rev 824)
@@ -16,7 +16,7 @@
<page:param name="title">Global reports</page:param>
<page:param name="width">100%</page:param>
<p>
- <webwork:text name="Select a report to generate and display"/>
+ <webwork:text name="Select a report to generate and display."/>
</page:applyDecorator>
<br>
<table bgcolor="ffffff" width="100%"><tr><td>
|
Author: adamw Date: 2005-08-11 15:05:19 -0400 (Thu, 11 Aug 2005) New Revision: 823 Added: trunk/forge/jira-extensions/jira-file-modifications/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/actions.xml trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/entitydefs/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/entitydefs/entitygroup.xml trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/entitydefs/entitymodel.xml trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/votes-assigment-types.xml trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/decorators/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/decorators/admin.jsp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/.bodytop.jsp.swp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/bodytop.jsp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/panels/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/panels/project/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/panels/project/schemes.jsp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/addscheme.jsp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/addvotesassigment.jsp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/deletescheme.jsp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/deletevotesassigment.jsp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/editscheme.jsp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/editvotesassigments.jsp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/admin/views/voting/viewschemes.jsp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/views/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/views/voting/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/project/views/voting/selectprojectscheme.jsp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/.globalreports.jsp.swp trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/globalreports/globalreports.jsp trunk/forge/jira-extensions/jira-file-modifications/maven.xml trunk/forge/jira-extensions/jira-file-modifications/project.properties trunk/forge/jira-extensions/jira-file-modifications/project.xml Removed: trunk/forge/jira-extensions/voting/jira-3.0/ trunk/forge/jira-extensions/voting/jira-3.1/ trunk/forge/jira-extensions/voting/jira-3.2/ Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm trunk/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm trunk/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm trunk/forge/jira-extensions/maven.xml trunk/forge/jira-extensions/voting/maven.xml Log: Global reports tab Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm =================================================================== --- trunk/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm 2005-08-11 15:47:30 UTC (rev 822) +++ trunk/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm 2005-08-11 19:05:19 UTC (rev 823) @@ -4,7 +4,7 @@ <table width="100%" border="1" cellspacing="0" cellpadding="0" bordercolor="#aaaaaa"> <tr> - <td rowspan="2" bgcolor="#aaaaaa"><b>User login</b></td><td colspan="$pList.size()" bgcolor="#aaaaaa"><b>Issues per project</b></td><td rowspan="2" bgcolor="#aaaaaa"><b>No of projects</b></td> + <td rowspan="2" bgcolor="#aaaaaa"><b>User login</b></td><td colspan="$pList.size()" bgcolor="#aaaaaa"><b>Issues per project</b></td><td rowspan="2" bgcolor="#aaaaaa"><b>Number of projects</b></td> <tr> #foreach ($pronum in $pList) @@ -27,7 +27,7 @@ #end <br> <table> - <tr><td colspan="2">TopTen Graph - <i>at least one issue per project<br><div style="text-size: small">$activeProj</div></i> </td><td>No of issues</td></tr> + <tr><td colspan="2">TopTen Graph - <i>at least one issue per project<br><div style="text-size: small">$activeProj</div></i> </td><td>Number of issues</td></tr> #foreach ($barKey in $topTenSumUs) <tr> #set($bar = $topTen.get($barKey)) @@ -54,7 +54,7 @@ <br> <table> <tr><td colspan="3">Projects per developer graph</td></tr> - <tr><td colspan="2">User</td><td>No of projects</td></tr> + <tr><td colspan="2">User</td><td>Number of projects</td></tr> #foreach ($key in $sort ) #set($colourIt = $velocityCount % 7) #set($proNum = $sum.get($key) * $GRAPH_MULT) Modified: trunk/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm =================================================================== --- trunk/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm 2005-08-11 15:47:30 UTC (rev 822) +++ trunk/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm 2005-08-11 19:05:19 UTC (rev 823) @@ -4,7 +4,7 @@ <table border="0"> <tr> - <td class="formtitle">Project:</td><td colspan="2" class="formtitle" align="right">No of developers</td> + <td class="formtitle">Project:</td><td colspan="2" class="formtitle" align="right">Number of developers</td> </tr> #foreach( $key in $projectSort ) #set ($width = $developersCount.get($key) * $mult) Modified: trunk/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm =================================================================== --- trunk/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm 2005-08-11 15:47:30 UTC (rev 822) +++ trunk/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm 2005-08-11 19:05:19 UTC (rev 823) @@ -4,7 +4,7 @@ #*<table border="0"> <tr> - <td class="formtitle">Project</td><td class="formtitle">No of issues</td> + <td class="formtitle">Project</td><td class="formtitle">Number of issues</td> </tr> #foreach( $key in $issuesSort ) <tr><td><a href="../secure/BrowseProject.jspa?id=$key">$pNames.get($key)</a></td><td>$issues.get($key)</td></tr> @@ -17,7 +17,7 @@ <table border="0"> ##<tr><td class="formtitle">Graph</td></tr> <tr> - <td class="formtitle">Project</td><td colspan="2" class="formtitle" align="right">No of issues</td> + <td class="formtitle">Project</td><td colspan="2" class="formtitle" align="right">Number of issues</td> </tr> #foreach( $key in $issuesSort ) #set ($width = $issues.get($key) * $mult) Added: trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/actions.xml =================================================================== --- trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/actions.xml 2005-08-11 15:47:30 UTC (rev 822) +++ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/WEB-INF/classes/actions.xml 2005-08-11 19:05:19 UTC (rev 823) @@ -0,0 +1,2158 @@ +<!-- Actions for the JIRA Web Application --> +<actions> + + <!-- Entity Administration --> + <action name="user.Logout" alias="Logout"> + <view name="error">/logoutconfirm.jsp</view> + <view name="confirm">/logoutconfirm.jsp</view> + <view name="logout">/logout.jsp</view> + </action> + + <action name="project.AddProject" alias="AddProject" roles-required="admin"> + <view name="error">/secure/admin/views/addproject.jsp</view> + <view name="input">/secure/admin/views/addproject.jsp</view> + </action> + + <action name="project.DeleteProject" alias="DeleteProject" roles-required="admin"> + <view name="success">/secure/admin/default.jsp</view> + <view name="error">/secure/admin/views/deleteprojectconfirm.jsp</view> + <view name="input">/secure/admin/views/deleteprojectconfirm.jsp</view> + </action> + + <action name="admin.notification.SelectProjectScheme" alias="SelectProjectScheme" roles-required="admin"> + <view name="success">/secure/project/views/notifications/selectprojectscheme.jsp</view> + <view name="input">/secure/project/views/notifications/selectprojectscheme.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="admin.workflow.scheme.SelectProjectWorkflowScheme" alias="SelectProjectWorkflowScheme" roles-required="admin"> + <view name="input">/secure/project/views/workflows/selectprojectscheme.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="admin.workflow.scheme.SelectProjectWorkflowSchemeStep2" alias="SelectProjectWorkflowSchemeStep2" roles-required="admin"> + <view name="success">/secure/project/views/workflows/selectprojectschemestep2.jsp</view> + <view name="error">/secure/project/views/workflows/selectprojectschemestep2.jsp</view> + <view name="input">/secure/project/views/workflows/selectprojectschemestep2.jsp</view> + <view name="workflowmigrationerror">/secure/views/workflowmigrationerror.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.SelectProjectCategory" alias="SelectProjectCategory" roles-required="admin"> + <view name="success">/secure/project/views/selectprojectcategory.jsp</view> + <view name="input">/secure/project/views/selectprojectcategory.jsp</view> + </action> + + <action name="admin.permission.SelectProjectPermissionScheme" alias="SelectProjectPermissionScheme" roles-required="admin"> + <view name="success">/secure/project/views/permissions/selectprojectpermissionscheme.jsp</view> + <view name="input">/secure/project/views/permissions/selectprojectpermissionscheme.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="admin.issuesecurity.SelectProjectIssueSecurityScheme" alias="SelectProjectIssueSecurityScheme" roles-required="admin"> + <view name="success">/secure/project/views/issuesecurity/selectprojectissuesecurityscheme.jsp</view> + <view name="input">/secure/project/views/issuesecurity/selectprojectissuesecurityscheme.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="admin.workflow.ActivateWorkflow" alias="ActivateWorkflow" roles-required="admin"> + <view name="workflowmigrationerror">/secure/views/workflowmigrationerror.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <!-- User Administration --> + <action name="admin.user.GroupBrowser" alias="GroupBrowser" roles-required="admin"> + <view name="success">/secure/admin/user/views/groupbrowser.jsp</view> + </action> + + <action name="admin.user.ViewGroup" alias="ViewGroup" roles-required="admin"> + <view name="success">/secure/admin/user/views/viewgroup.jsp</view> + </action> + + <action name="admin.user.DeleteGroup" alias="DeleteGroup" roles-required="admin"> + <view name="error">/secure/admin/user/views/deletegroupconfirm.jsp</view> + <view name="input">/secure/admin/user/views/deletegroupconfirm.jsp</view> + </action> + + <action name="admin.user.UserBrowser" alias="UserBrowser" roles-required="admin"> + <view name="success">/secure/admin/user/views/userbrowser.jsp</view> + </action> + + <action name="admin.user.UserPickerBrowser" alias="UserPickerBrowser" roles-required="pickusers"> + <view name="success">/secure/popups/userpicker.jsp</view> + <view name="input">/secure/popups/userpicker.jsp</view> + </action> + + <action name="issue.navigator.DueDatePicker" alias="DueDatePicker"> + <view name="open">/secure/popups/duedatepicker.jsp</view> + </action> + + <action name="admin.IconPicker" alias="IconPicker"> + <view name="error">/secure/popups/iconpicker.jsp</view> + <view name="success">/secure/popups/iconpicker.jsp</view> + </action> + + <action name="admin.user.AddUser" alias="AddUser" roles-required="admin"> + <view name="error">/secure/admin/user/views/adduser.jsp</view> + <view name="input">/secure/admin/user/views/adduser.jsp</view> + </action> + + <action name="admin.user.ViewUser" alias="ViewUser" roles-required="admin"> + <view name="success">/secure/admin/user/views/viewuser.jsp</view> + <view name="error">/secure/admin/user/views/viewuser.jsp</view> + </action> + + <action name="admin.user.EditUser" alias="EditUser" roles-required="admin"> + <view name="error">/secure/admin/user/views/editprofile.jsp</view> + <view name="input">/secure/admin/user/views/editprofile.jsp</view> + </action> + + <action name="admin.user.EditUserGroups" alias="EditUserGroups" roles-required="admin"> + <view name="error">/secure/admin/user/views/editusergroups.jsp</view> + <view name="success">/secure/admin/user/views/editusergroups.jsp</view> + </action> + + <action name="admin.user.DeleteUser" alias="DeleteUser" roles-required="admin"> + <view name="error">/secure/admin/user/views/deleteuserconfirm.jsp</view> + <view name="input">/secure/admin/user/views/deleteuserconfirm.jsp</view> + </action> + + <action name="admin.user.SetPassword" alias="SetPassword" roles-required="admin"> + <view name="error">/secure/admin/user/views/setpassword.jsp</view> + <view name="input">/secure/admin/user/views/setpassword.jsp</view> + </action> + + <action name="project.EditVersionDetails" alias="EditVersionDetails"> + <view name="success">/secure/project/views/editversiondetails.jsp</view> + <view name="error">/secure/project/views/editversiondetails.jsp</view> + <view name="input">/secure/project/views/editversiondetails.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <!-- Project administration --> + <action name="project.ViewProjects" alias="ViewProjects"> + <view name="success">/secure/project/views/viewprojects.jsp</view> + </action> + + <action name="project.ViewProject" alias="ViewProject"> + <view name="input">/secure/project/views/viewprojecterror.jsp</view> + <view name="success">/secure/project/views/viewproject.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.EditProject" alias="EditProject"> + <view name="success">/secure/project/views/editproject.jsp</view> + <view name="error">/secure/project/views/editproject.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.AddComponent" alias="AddComponent"> + <view name="success">/secure/project/views/addcomponent.jsp</view> + <view name="error">/secure/project/views/addcomponent.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.DeleteComponent" alias="DeleteComponent"> + <view name="success">/secure/project/views/deletecomponentconfirm.jsp</view> + <view name="error">/secure/project/views/deletecomponentconfirm.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.EditComponent" alias="EditComponent"> + <view name="success">/secure/project/views/editcomponent.jsp</view> + <view name="error">/secure/project/views/editcomponent.jsp</view> + <view name="input">/secure/project/views/editcomponent.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.enterprise.SelectComponentAssignees" alias="SelectComponentAssignees"> + <view name="error">/secure/project/views/select_componentassignees.jsp</view> + <view name="input">/secure/project/views/select_componentassignees.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.ManageVersions" alias="ManageVersions"> + <view name="success">/secure/project/views/manageversions.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + <command name="moveUp" alias="VersionUp"> + <view name="success">/secure/project/views/manageversions.jsp</view> + <view name="error">/secure/project/views/manageversions.jsp</view> + </command> + <command name="moveDown" alias="VersionDown"> + <view name="success">/secure/project/views/manageversions.jsp</view> + <view name="error">/secure/project/views/manageversions.jsp</view> + </command> + <command name="moveFirst" alias="VersionFirst"> + <view name="success">/secure/project/views/manageversions.jsp</view> + <view name="error">/secure/project/views/manageversions.jsp</view> + </command> + <command name="moveLast" alias="VersionLast"> + <view name="success">/secure/project/views/manageversions.jsp</view> + <view name="error">/secure/project/views/manageversions.jsp</view> + </command> + </action> + + <action name="project.AddVersion" alias="AddVersion"> + <view name="success">/secure/project/views/manageversions.jsp</view> + <view name="error">/secure/project/views/manageversions.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.EditVersionReleaseDate" alias="EditVersionReleaseDate"> + <view name="success">/secure/project/views/editversionreleasedate.jsp</view> + <view name="error">/secure/project/views/editversionreleasedate.jsp</view> + <view name="input">/secure/project/views/editversionreleasedate.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.EditVersionReleases" alias="EditVersionReleases"> + <view name="success">/secure/project/views/manageversions.jsp</view> + <view name="input">/secure/project/views/checkversionreleases.jsp</view> + <view name="checkrelease">/secure/project/views/checkversionreleases.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.EditVersionArchives" alias="EditVersionArchives"> + <view name="success">/secure/project/views/manageversions.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.MergeVersions" alias="MergeVersions"> + <view name="success">/secure/project/views/mergeversionconfirm.jsp</view> + <view name="input">/secure/project/views/mergeversionselect.jsp</view> + <view name="error">/secure/project/views/mergeversionselect.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + <command name="merge" alias="Merge"> + <view name="error">/secure/project/views/mergeversionselect.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </command> + </action> + + <action name="project.RescheduleVersions" alias="RescheduleVersions"> + <view name="success">/secure/project/views/rescheduleversions.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <action name="project.DeleteVersion" alias="DeleteVersion"> + <view name="success">/secure/project/views/deleteversionconfirm.jsp</view> + <view name="error">/secure/project/views/deleteversionconfirm.jsp</view> + <view name="securitybreach">/secure/views/securitybreach.jsp</view> + </action> + + <!--ProjectCategory Actions--> + <action name="projectcategory.AddProjectCategory" alias="ViewProjectCategories" roles-required="admin"> + <view name="success">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> + <view name="input">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> + <view name="error">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> + </action> + + <action name="projectcategory.AddProjectCategory" alias="AddProjectCategory" roles-required="admin"> + <view name="input">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> + <view name="error">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> + </action> + + <action name="projectcategory.EditProjectCategory" alias="EditProjectCategory" roles-required="admin"> + <view name="input">/secure/admin/views/projectcategory/editprojectcategory.jsp</view> + <view name="error">/secure/admin/views/projectcategory/editprojectcategory.jsp</view> + </action> + + <action name="projectcategory.DeleteProjectCategory" alias="DeleteProjectCategory" roles-required="admin"> + <view name="input">/secure/admin/views/projectcategory/deleteprojectcategoryconfirm.jsp</view> + <view name="error">/secure/admin/views/projectcategory/deleteprojectcategoryconfirm.jsp</view> + </action> + + <!-- Utility Actions --> + <action name="util.ExportAll" alias="XmlBackup" roles-required="admin"> + <view name="success">/secure/admin/views/exportall_result.jsp</view> + <view name="error">/secure/admin/views/exportall_options.jsp</view> + <view name="confirm">/secure/admin/views/exportall_confirm.jsp</view> + <view name="fixchars">/secure/admin/views/exportall_fixchars.jsp</view> + <view name="input">/secure/admin/views/exportall_options.jsp</view> + </action> + + <action name="util.ImportAll" alias="XmlRestore" roles-required="admin"> + <view name="success">/secure/admin/views/importall_result.jsp</view> + <view name="error">/secure/admin/views/importall_options.jsp</view> + <view name="input">/secure/admin/views/importall_options.jsp</view> + </action> + + <!-- The security check is built into this action, as the user is not loged in + when it is called. --> + <action name="util.CleanData" alias="CleanData"> + <view name="success">/views/cleandatabase.jsp</view> + <view name="error">/views/cleandatabase.jsp</view> + </action> + <action name="util.LDAPConfigurer" alias="LDAPConfigurer"> + <view name="success">/views/ldapconfigurer_result.jsp</view> + <view name="error">/views/ldapconfigurer.jsp</view> + </action> + + <action name="util.BugzillaImport" alias="BugzillaImport" roles-required="admin"> + <view name="input">/secure/admin/views/bugzillaimport/bugzilla_connect.jsp</view> + <view name="success">/secure/admin/views/bugzillaimport/bugzilla_select.jsp</view> + <view name="error">/secure/admin/views/bugzillaimport/bugzilla_connect.jsp</view> + + <view name="monitor">/secure/admin/views/bugzillaimport/bugzilla_monitor.jsp?decorator=none</view> + + <command name="setProjectDefaults" alias="BugzillaSetProjectDefaults"> + <view name="choosemappings">/secure/admin/views/bugzillaimport/bugzilla_choosemappings.jsp</view> + </command> + + <command name="run" alias="BugzillaRun"> + <view name="success">/secure/admin/views/bugzillaimport/bugzilla_run.jsp</view> + <view name="input">/secure/admin/views/bugzillaimport/bugzilla_choosemappings.jsp</view> + <view name="error">/secure/admin/views/bugzillaimport/bugzilla_select.jsp</view> + </command> + + </action> + <action name="util.MantisImport" alias="MantisImport" roles-required="admin"> + <view name="input">/secure/admin/views/mantisimport/mantis_connect.jsp</view> + <view name="success">/secure/admin/views/mantisimport/mantis_select.jsp</view> + <view name="error">/secure/admin/views/mantisimport/mantis_connect.jsp</view> + + <view name="monitor">/secure/admin/views/mantisimport/mantis_monitor.jsp?decorator=none</view> + + <command name="setProjectDefaults" alias="MantisSetProjectDefaults"> + <view name="choosemappings">/secure/admin/views/mantisimport/mantis_choosemappings.jsp</view> + </command> + + <command name="run" alias="MantisRun"> + <view name="success">/secure/admin/views/mantisimport/mantis_run.jsp</view> + <view name="input">/secure/admin/views/mantisimport/mantis_choosemappings.jsp</view> + <view name="error">/secure/admin/views/mantisimport/mantis_select.jsp</view> + </command> + </action> + + <action name="util.TestTrackProXMLImport" alias="TestTrackProXMLImport" roles-required="admin"> + <view name="input">/secure/admin/views/testtrackproimport/testtrackpro_xmlimport.jsp</view> + <view name="success">/secure/admin/views/testtrackproimport/testtrackpro_xmlimport.jsp</view> + </action> + + <action name="util.CsvImporter" alias="CsvImport" roles-required="admin"> + <view name="error">/secure/admin/views/importers/csv/csvimport.jsp</view> + <view name="input">/secure/admin/views/importers/csv/csvimport.jsp</view> + <view name="settings">/secure/admin/views/importers/csv/importsettings.jsp</view> + <view name="logs">/secure/admin/views/importers/csv/viewlogs.jsp</view> + <view name="finished">/secure/admin/views/importers/csv/finishedimport.jsp</view> + <view name="success">/secure/admin/views/importers/csv/csvimport.jsp</view> + </action> + + <action name="util.csv.ConfigureCsvMapping" alias="ConfigureCsvMapping" roles-required="admin"> + <view name="error">/secure/admin/views/importers/csv/csvconfig.jsp</view> + <view name="input">/secure/admin/views/importers/csv/csvconfig.jsp</view> + <view name="1">/secure/admin/views/importers/csv/configproject.jsp</view> + <view name="2">/secure/admin/views/importers/csv/configissuemapping.jsp</view> + <view name="3">/secure/admin/views/importers/csv/configvaluemapping.jsp</view> + <view name="5">/secure/admin/views/importers/csv/savepropertiesfile.jsp</view> + <view name="4">/secure/admin/views/importers/csv/configdateuserdefaults.jsp</view> + <view name="success">/secure/admin/views/importers/csv/csvimport.jsp</view> + <view name="importwithoutsaving">CsvImport!settings.jspa</view> + </action> + + <!-- <action name="util.IdsImporter" alias="IdsImport" roles-required="admin">--> + <!-- <view name="input">/secure/admin/views/importers/importcsv.jsp</view>--> + <!-- <view name="success">/secure/admin/views/importers/importcsv.jsp</view>--> + <!-- </action>--> + <!-- <action name="util.XmlImporter" alias="XmlImport" roles-required="admin">--> + <!-- <view name="input">/secure/admin/views/importers/xmlimport.jsp</view>--> + <!-- <view name="success">/secure/admin/views/importers/xmlimport.jsp</view>--> + <!-- </action>--> + + <action name="util.ShowConstantsHelp" alias="ShowConstantsHelp" roles-required="use"> + <view name="success">/secure/showconstantshelp.jsp</view> + </action> + + <action name="util.JellyRunner" alias="JellyRunner" roles-required="admin"> + <view name="input">/secure/admin/views/jelly_runner.jsp</view> + <view name="error">/secure/admin/views/jelly_runner.jsp</view> + <view name="success">/secure/admin/views/jelly_result.jsp</view> + </action> + + <!-- JIRA Administration --> + <action name="admin.ViewPlugins" alias="ViewPlugins" roles-required="admin"> + <view name="input">/secure/admin/views/plugins/viewplugins.jsp</view> + <view name="success">/secure/admin/views/plugins/viewplugins.jsp</view> + </action> + + <action name="admin.ViewListeners" alias="ViewListeners" roles-required="admin"> + <view name="input">/secure/admin/views/listeners/viewlisteners.jsp</view> + <view name="success">/secure/admin/views/listeners/viewlisteners.jsp</view> + </action> + + <action name="admin.EditListener" alias="EditListener" roles-required="admin"> + <view name="input">/secure/admin/views/listeners/editlistener.jsp</view> + <view name="error">/secure/admin/views/listeners/editlistener.jsp</view> + </action> + + <action name="admin.ViewServices" alias="ViewServices" roles-required="admin"> + <view name="input">/secure/admin/views/services/viewservices.jsp</view> + <view name="success">/secure/admin/views/services/viewservices.jsp</view> + </action> + + <action name="admin.EditService" alias="EditService" roles-required="admin"> + <view name="input">/secure/admin/views/services/editservice.jsp</view> + <view name="error">/secure/admin/views/services/editservice.jsp</view> + </action> + + <action name="admin.linking.ViewLinkTypes" alias="ViewLinkTypes" roles-required="admin"> + <view name="input">/secure/admin/jira/views/viewlinktypes.jsp</view> + <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view> + <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view> + + <command name="activate" alias="IssueLinkingActivate"> + <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view> + <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view> + </command> + <command name="deactivate" alias="IssueLinkingDeActivate"> + <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view> + <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view> + </command> + </action> + + <action name="admin.linking.EditLinkType" alias="EditLinkType" roles-required="admin"> + <view name="input">/secure/admin/jira/views/editlinktype.jsp</view> + <view name="error">/secure/admin/jira/views/editlinktype.jsp</view> + </action> + + <action name="admin.linking.DeleteLinkType" alias="DeleteLinkType" roles-required="admin"> + <view name="input">/secure/admin/jira/views/deletelinktype.jsp</view> + <view name="error">/secure/admin/jira/views/deletelinktype.jsp</view> + </action> + + <action name="admin.ViewApplicationProperties" alias="ViewApplicationProperties" roles-required="admin"> + <view name="success">/secure/admin/jira/views/applicationproperties.jsp</view> + </action> + + <action name="admin.ViewAttachmentSettings" alias="ViewAttachmentSettings" roles-required="admin"> + <view name="success">/secure/admin/jira/views/attachments.jsp</view> + </action> + + <action name="admin.SchedulerAdmin" alias="SchedulerAdmin" roles-required="admin"> + <view name="success">/secure/admin/jira/views/scheduleradmin.jsp</view> + </action> + + <action name="admin.MailQueueAdmin" alias="MailQueueAdmin" roles-required="admin"> + <view name="input">/secure/admin/jira/views/mailqueueadmin.jsp</view> + <view name="success">/secure/admin/jira/views/mailqueueadmin.jsp</view> + </action> + + <action name="admin.IndexAdminImpl" alias="IndexAdmin" roles-required="admin"> + <view name="success">/secure/admin/jira/views/indexing.jsp</view> + <view name="error">/secure/admin/jira/views/indexing.jsp</view> + + <command name="reindex" alias="IndexReIndex"> + <view name="success">/secure/admin/jira/views/indexing.jsp</view> + <view name="error">/secure/admin/jira/views/indexing.jsp</view> + </command> + <command name="activate" alias="IndexActivate"> + <view name="success">/secure/admin/jira/views/indexing.jsp</view> + <view name="error">/secure/admin/jira/views/indexing.jsp</view> + </command> + <command name="deactivate" alias="IndexDeActivate"> + <view name="success">/secure/admin/jira/views/indexing.jsp</view> + <view name="error">/secure/admin/jira/views/indexing.jsp</view> + </command> + </action> + + <action name="admin.TimeTrackingAdmin" alias="TimeTrackingAdmin" roles-required="admin"> + <view name="success">/secure/admin/jira/views/timetracking.jsp</view> + <view name="error">/secure/admin/jira/views/timetracking.jsp</view> + + <command name="activate" alias="TimeTrackingActivate"> + <view name="success">/secure/admin/jira/views/timetracking.jsp</view> + <view name="error">/secure/admin/jira/views/timetracking.jsp</view> + </command> + <command name="deactivate" alias="TimeTrackingDeActivate"> + <view name="success">/secure/admin/jira/views/timetracking.jsp</view> + <view name="error">/secure/admin/jira/views/timetracking.jsp</view> + </command> + </action> + + <action name="admin.TrackbackAdmin" alias="TrackbackAdmin" roles-required="admin"> + <view name="success">/secure/admin/jira/views/trackback.jsp</view> + <view name="input">/secure/admin/jira/views/edittrackback.jsp</view> + <view name="error">/secure/admin/jira/views/edittrackback.jsp</view> + + <command name="activate" alias="TrackbackActivate"> + <view name="success">/secure/admin/jira/views/trackback.jsp</view> + <view name="error">/secure/admin/jira/views/trackback.jsp</view> + </command> + <command name="deactivate" alias="TrackbackDeActivate"> + <view name="success">/secure/admin/jira/views/trackback.jsp</view> + <view name="error">/secure/admin/jira/views/trackback.jsp</view> + </command> + </action> + + <action name="admin.ConfigureDefaultPortal" alias="EditDefaultDashboard" roles-required="admin"> + <view name="input">/secure/admin/views/editdefaultdashboardconfig.jsp</view> + <view name="error">/secure/admin/views/editdefaultdashboardconfig.jsp</view> + </action> + + <action name="admin.AddDefaultPortlet" alias="AddDefaultPortlet" roles-required="admin"> + <view name="error">/secure/admin/views/editdefaultdashboardconfig.jsp</view> + <view name="input">/secure/admin/views/adddefaultportlet.jsp</view> + </action> + + <action name="admin.SaveDefaultConfiguration" alias="SaveDefaultPortlet" roles-required="admin"> + <view name="input">/secure/admin/views/configuredefaultportlet.jsp</view> + </action> + + <action name="admin.ViewLicense" alias="ViewLicense" roles-required="admin"> + <view name="success">/secure/admin/jira/views/viewlicense.jsp</view> + <view name="input">/secure/admin/jira/views/viewlicense.jsp</view> + <view name="error">/secure/admin/jira/views/viewlicense.jsp</view> + <view name="oldlicense">/secure/errors.jsp</view> + </action> + + <action name="admin.EditApplicationProperties" alias="EditApplicationProperties" roles-required="admin"> + <view name="error">/secure/admin/jira/views/editapplicationproperties.jsp</view> + <view name="input">/secure/admin/jira/views/editapplicationproperties.jsp</view> + </action> + + <action name="admin.EditAttachmentSettings" alias="EditAttachmentSettings" roles-required="admin"> + <view name="error">/secure/admin/jira/views/editattachmentsettings.jsp</view> + <view name="input">/secure/admin/jira/views/editattachmentsettings.jsp</view> + </action> + + <action name="admin.GlobalPermissions" alias="GlobalPermissions" roles-required="admin"> + <view name="success">/secure/admin/jira/views/globalpermissions.jsp</view> + <view name="error">/secure/admin/jira/views/globalpermissions.jsp</view> + </action> + + <action name="admin.ViewLookAndFeel" alias="ViewLookAndFeel" roles-required="admin"> + <view name="success">/secure/admin/jira/views/lookandfeel.jsp</view> + </action> + + <action name="admin.EditLookAndFeel" alias="EditLookAndFeel" roles-required="admin"> + <view name="input">/secure/admin/jira/views/editlookandfeel.jsp</view> + <view name="error">/secure/admin/jira/views/editlookandfeel.jsp</view> + </action> + + <action name="admin.ConfigureIssueCache" alias="ConfigureCache" roles-required="admin"> + <command name="viewCacheConfig" alias="ViewCacheConfig"> + <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view> + </command> + <command name="flushCache" alias="FlushIssueCache"> + <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view> + </command> + <command name="chooseCacheCapacity" alias="ChooseCacheCapacity"> + <view name="input">/secure/admin/views/editcacheconfiguration.jsp</view> + </command> + <command name="flushStats" alias="ResetCacheStats"> + <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view> + </command> + <command name="setCacheCapacity" alias="SetCacheCapacity"> + <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view> + <view name="error">/secure/admin/views/editcacheconfiguration.jsp</view> + </command> + </action> + + <action name="admin.ViewSystemInfo" alias="ViewSystemInfo" roles-required="admin"> + <view name="success">/secure/admin/jira/views/systeminfo.jsp</view> + </action> + + <action name="admin.JiraSupportRequest" alias="JiraSupportRequest" roles-required="admin"> + <view name="input">/secure/admin/jira/views/jirasupportrequest.jsp</view> + <view name="success">/secure/admin/jira/views/jirasupportrequest.jsp</view> + </action> + + <action name="admin.SetupLicense" alias="SetupLicense"> + <view name="success">/views/setuplicense.jsp</view> + <view name="error">/views/setuplicense.jsp</view> + </action> + + <action name="admin.ConfirmNewInstallationWithOldLicense" alias="ConfirmNewInstallationWithOldLicense"> + <view name="success">/views/confirmnewinstallationwitholdlicense.jsp</view> + <view name="error">/views/confirmnewinstallationwitholdlicense.jsp</view> + </action> + + <!-- Constants Administration --> + <action name="admin.priorities.ViewPriorities" alias="ViewPriorities" roles-required="admin"> + <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view> + <command name="addPriority" alias="AddPriority"> + <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view> + <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view> + </command> + <command name="moveDown" alias="PriorityDown"> + <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view> + <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view> + </command> + <command name="moveUp" alias="PriorityUp"> + <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view> + <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view> + </command> + <command name="makeDefault" alias="MakeDefaultPriority"> + <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view> + <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view> + </command> + </action> + + <action name="admin.priorities.EditPriority" alias="EditPriority" roles-required="admin"> + <view name="input">/secure/admin/views/priorities/editpriority.jsp</view> + <view name="error">/secure/admin/views/priorities/editpriority.jsp</view> + </action> + + <action name="admin.priorities.DeletePriority" alias="DeletePriority" roles-required="admin"> + <view name="input">/secure/admin/views/priorities/deletepriority.jsp</view> + <view name="error">/secure/admin/views/priorities/deletepriority.jsp</view> + </action> + + <action name="admin.resolutions.ViewResolutions" alias="ViewResolutions" roles-required="admin"> + <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view> + <command name="addConstant" alias="AddResolution"> + <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view> + <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view> + </command> + <command name="moveDown" alias="ResolutionDown"> + <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view> + <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view> + </command> + <command name="moveUp" alias="ResolutionUp"> + <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view> + <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view> + </command> + <command name="makeDefault" alias="MakeDefaultResolution"> + <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view> + <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view> + </command> + </action> + + <action name="admin.resolutions.EditResolution" alias="EditResolution" roles-required="admin"> + <view name="input">/secure/admin/views/resolutions/editresolution.jsp</view> + <view name="error">/secure/admin/views/resolutions/editresolution.jsp</view> + </action> + + <action name="admin.resolutions.DeleteResolution" alias="DeleteResolution" roles-required="admin"> + <view name="input">/secure/admin/views/resolutions/deleteresolution.jsp</view> + <view name="error">/secure/admin/views/resolutions/deleteresolution.jsp</view> + </action> + + <action name="admin.issuefields.ViewIssueFields" alias="ViewIssueFields" roles-required="admin"> + <view name="success">/secure/admin/views/viewissuefields.jsp</view> + <command name="moveDown" alias="IssueFieldDown"> + <view name="success">/secure/admin/views/viewissuefields.jsp</view> + <view name="error">/secure/admin/views/viewissuefields.jsp</view> + </command> + <command name="moveUp" alias="IssueFieldUp"> + <view name="success">/secure/admin/views/viewissuefields.jsp</view> + <view name="error">/secure/admin/views/viewissuefields.jsp</view> + </command> + <command name="hide" alias="IssueFieldHide"> + <view name="success">/secure/admin/views/viewissuefields.jsp</view> + <view name="error">/secure/admin/views/viewissuefields.jsp</view> + </command> + <command name="require" alias="IssueFieldRequire"> + <view name="success">/secure/admin/views/viewissuefields.jsp</view> + <view name="error">/secure/admin/views/viewissuefields.jsp</view> + </command> + <command name="restoreDefaults" alias="RestoreDefaults"> + <view name="success">/secure/admin/views/viewissuefields.jsp</view> + <view name="error">/secure/admin/views/viewissuefields.jsp</view> + </command> + </action> + + <action name="admin.issuefields.EditDefaultFieldLayoutItem" alias="EditDefaultFieldLayoutItem" roles-required="admin"> + <view name="input">/secure/admin/views/issuefields/editdefaultfieldlayoutitem.jsp</view> + <view name="error">/secure/admin/views/issuefields/editdefaultfieldlayoutitem.jsp</view> + </action> + + <action name="admin.issuefields.enterprise.ViewSchemes" alias="ViewFieldLayoutSchemes" roles-required="admin"> + <view name="success">/secure/admin/views/issuefields/viewfieldlayoutschemes.jsp</view> + + <command name="addScheme" alias="AddFieldLayoutScheme"> + <view name="error">/secure/admin/views/issuefields/viewfieldlayoutschemes.jsp</view> + </command> + </action> + + <action name="admin.issuefields.enterprise.EditFieldLayoutScheme" alias="EditFieldLayoutScheme" roles-required="admin"> + <view name="input">/secure/admin/views/issuefields/editfieldlayoutscheme.jsp</view> + <view name="error">/secure/admin/views/issuefields/editfieldlayoutscheme.jsp</view> + + <command name="deleteScheme" alias="DeleteFieldLayoutScheme"> + <view name="confirm">/secure/admin/views/issuefields/deletefieldlayoutscheme.jsp</view> + <view name="error">/secure/admin/views/issuefields/deletefieldlayoutscheme.jsp</view> + </command> + </action> + + <action name="admin.issuefields.enterprise.CopyFieldLayoutScheme" alias="CopyFieldLayoutScheme" roles-required="admin"> + <view name="input">/secure/admin/views/issuefields/copyfieldlayoutscheme.jsp</view> + <view name="error">/secure/admin/views/issuefields/copyfieldlayoutscheme.jsp</view> + </action> + + <action name="admin.issuefields.enterprise.ConfigureFieldLayoutScheme" alias="ConfigureFieldLayoutScheme" roles-required="admin"> + <view name="error">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view> + <view name="success">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view> + + <command name="addFieldLayoutSchemeEntity" alias="AddFieldLayoutSchemeEntity"> + <view name="error">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view> + </command> + + <command name="deleteFieldLayoutSchemeEntity" alias="DeleteFieldLayoutSchemeEntity"> + <view name="error">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view> + </command> + + <command name="editFieldLayoutSchemeEntity" alias="EditFieldLayoutSchemeEntity"> + <view name="input">/secure/admin/views/issuefields/editfieldlayoutschemeentity.jsp</view> + <view name="error">/secure/admin/views/issuefields/editfieldlayoutschemeentity.jsp</view> + </command> + </action> + + <action name="admin.issuefields.enterprise.SelectFieldLayoutScheme" alias="SelectFieldLayoutScheme" roles-required="admin"> + <view name="input">/secure/project/views/issuefields/selectfieldlayoutscheme.jsp</view> + <view name="error">/secure/project/views/issuefields/selectfieldlayoutscheme.jsp</view> + </action> + + <action name="admin.issuefields.enterprise.ViewFieldLayouts" alias="ViewFieldLayouts" roles-required="admin"> + <view name="success">/secure/admin/views/issuefields/viewfieldlayouts.jsp</view> + + <command name="addFieldLayout" alias="AddFieldLayout"> + <view name="error">/secure/admin/views/issuefields/viewfieldlayouts.jsp</view> + </command> + + <command name="deleteFieldLayout" alias="DeleteFieldLayout"> + <view name="confirm">/secure/admin/views/issuefields/confirmdeletefieldlayout.jsp</view> + <view name="error">/secure/admin/views/issuefields/confirmdeletefieldlayout.jsp</view> + </command> + </action> + + <action name="admin.issuefields.enterprise.EditFieldLayout" alias="EditFieldLayout" roles-required="admin"> + <view name="input">/secure/admin/views/issuefields/editfieldlayout.jsp</view> + <view name="error">/secure/admin/views/issuefields/editfieldlayout.jsp</view> + </action> + + <action name="admin.issuefields.enterprise.CopyFieldLayout" alias="CopyFieldLayout" roles-required="admin"> + <view name="input">/secure/admin/views/issuefields/copyfieldlayout.jsp</view> + <view name="error">/secure/admin/views/issuefields/copyfieldlayout.jsp</view> + </action> + + <action name="admin.issuefields.enterprise.ConfigureFieldLayout" alias="ConfigureFieldLayout" roles-required="admin"> + <view name="input">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + <command name="moveDown" alias="EditFieldLayoutDown"> + <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + </command> + <command name="moveUp" alias="EditFieldLayoutUp"> + <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + </command> + <command name="hide" alias="EditFieldLayoutHide"> + <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + </command> + <command name="require" alias="EditFieldLayoutRequire"> + <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + </command> + <command name="restoreDefaults" alias="EditFieldLayoutRestoreDefaults"> + <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view> + </command> + </action> + + <action name="admin.issuefields.enterprise.EditFieldLayoutItem" alias="EditFieldLayoutItem" roles-required="admin"> + <view name="input">/secure/admin/views/issuefields/editfieldlayoutitem.jsp</view> + <view name="error">/secure/admin/views/issuefields/editfieldlayoutitem.jsp</view> + </action> + + <!-- Field Screens --> + <action name="admin.issuefields.screens.ViewFieldScreens" alias="ViewFieldScreens" roles-required="admin"> + <view name="error">/secure/admin/views/issuefields/screens/viewfieldscreens.jsp</view> + <view name="success">/secure/admin/views/issuefields/screens/viewfieldscreens.jsp</view> + + <command name="addFieldScreen" alias="AddFieldScreen"> + <view name="error">/secure/admin/views/issuefields/screens/viewfieldscreens.jsp</view> + </command> + + <command name="deleteFieldScreen" alias="DeleteFieldScreen"> + <view name="confirm">/secure/admin/views/issuefields/screens/confirmdeletefieldscreen.jsp</view> + <view name="error">/secure/admin/views/issuefields/screens/confirmdeletefieldscreen.jsp</view> + </command> + </action> + + <action name="admin.issuefields.screens.EditFieldScreen" alias="EditFieldScreen" roles-required="admin"> + <view name="input">/secure/admin/views/issuefields/screens/editfieldscreen.jsp</view> + <view name="error">/secure/admin/views/issuefields/screens/editfieldscreen.jsp</view> + + <command name="copyFieldScreen" alias="CopyFieldScreen"> + <view name="input">/secure/admin/views/issuefields/screens/copyfieldscreen.jsp</view> + <view name="error">/secure/admin/views/issuefields/screens/copyfieldscreen.jsp</view> + </command> + </action> + + <action name="admin.issuefields.screens.AssociateFieldToScreens" alias="AssociateFieldToScreens" roles-required="admin"> + <view name="input">/secure/admin/views/issuefields/screens/associatefield.jsp</view> + <view name="error">/secure/admin/views/issuefields/screens/associatefield.jsp</view> + </action> + + <action name="admin.issuefields.screens.ConfigureFieldScreen" alias="ConfigureFieldScreen" roles-required="admin"> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + <view name="success">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + + <command name="deleteField" alias="DeleteFieldScreenLayoutItem"> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + </command> + + <command name="addField" alias="AddFieldScreenLayoutItem"> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + </command> + + <command name="addTab" alias="AddFieldScreenTab"> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + </command> + + <command name="deleteTab" alias="DeleteFieldScreenTab"> + <view name="confirm">/secure/admin/views/issuefields/screens/confirmdeletefieldscreentab.jsp</view> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + </command> + + <command name="moveLayoutItemFirst" alias="FieldScreenLayoutItemFirst"> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + </command> + + <command name="moveLayoutItemUp" alias="FieldScreenLayoutItemUp"> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + </command> + + <command name="moveLayoutItemDown" alias="FieldScreenLayoutItemDown"> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + </command> + + <command name="moveLayoutItemLast" alias="FieldScreenLayoutItemLast"> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + </command> + + <command name="configureTab" alias="ConfigureFieldScreenTab"> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + </command> + + <command name="moveTabLeft" alias="MoveFieldScreenTabLeft"> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + </command> + + <command name="moveTabRight" alias="MoveFieldScreenTabRight"> + <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view> + </command> + </action> + + <!-- Issue Type Screen Schemes --> + <action name="admin.issuefields.screens.enterprise.ViewIssueTypeScreenSchemes" alias="ViewIssueTypeScreenSchemes" roles-required="admin"> + <view name="error">/secure/admin/views/issuefields/screens/enterprise/viewissuetypescreenschemes.jsp</view> + <view name="success">/secure/admin/views/issuefields/screens/enterprise/viewissuetypescreenschemes.jsp</view> + + <command name="addIssueTypeScreenScheme" alias="AddIssueTypeScreenScheme"> + <view name="error">/secure/admin/views/issuefields/screens/enterprise/viewissuetypescreenschemes.jsp</view> + </command> + + <command name="deleteIssueTypeScreenScheme" alias="DeleteIssueTypeScreenScheme"> + <view name="confirm">/secure/admin/views/issuefields/screens/enterprise/confirmdeleteissuetypescreenscheme.jsp</view> + <view name="error">/secure/admin/views/issuefields/screens/enterprise/confirmdeleteissuetypescreenscheme.jsp</view> + </command> + </action> + + <action name="admin.issuefields.screens.enterprise.EditIssueTypeScreenScheme" alias="EditIssueTypeScreenScheme" roles-required="admin"> + <view name="input">/secure/admin/views/issuefields/screens/enterprise/editissuetypescreenscheme.jsp</view> + <view name="error">/secure/admin/views/issuefields/screens/enterprise/editissuetypescreenscheme.jsp</view> + + <command name="copyIssueTypeScreenScheme" alias="CopyIssueTypeScreenScheme"> + <view name="input">/secure/admin/views/issuefields/screens/enterprise/copyissuetypescreenscheme.jsp</view> + <view name="error">/secure/admin/views/issuefields/screens/enterprise/copyissuetypescreenscheme.jsp</view> + </command> + </action> + + <action name="admin.issuefields.screens.enterprise.ConfigureIssueTypeScreenScheme" alias="ConfigureIssueTypeScreenScheme" roles-required="admin"> + <view name="error">/secure/admin/views/issuefields/screens/enterprise/configureissuetypescreenscheme.jsp</view> + <view name="success">/secure/admin/views/issuefields/screens/enterprise/configureissuetypescreenscheme.jsp</view> + + <command name="addIssueTypeScreenSchemeEntity" alias="AddIssueTypeScreenSchemeEntity"> + <view name="error">/secure/admin/views/issuefields/screens/enterprise/configureissuetypescreenscheme.jsp</view> + </command> + + <command name="deleteIssueTypeScreenSchemeEntity" alias="DeleteIssueTypeScreenSchemeEntity"> + <view name="error">/secure/admin/views/issuefields/screens/enterprise/configureissuetypescreenscheme.jsp</view> + </command> + + <command name="editIssueTypeScreenSchemeEntity" alias="EditIssueTypeScreenSchemeEntity"> + <view name="error">/secure/admin/views/issuefields/screens/enterprise/editissuetypescreenschemeentity.jsp</view> + </command> + </action> + + <action name="admin.issuefields.screens.enterprise.SelectIssueTypeScreenScheme" alias="SelectIssueTypeScreenScheme" roles-required="admin"> + <view name="input">/secure/project/views/issuefields/selectissuetypescreenscheme.jsp</view> + <view name="error">/secure/project/views/issuefields/selectissuetypescreenscheme.jsp</view> + </action> + + <action name="admin.issuefields.screens.SelectScreenScheme" alias="SelectScreenScheme" roles-required="admin"> + <view name="input">/secure/project/views/issuefields/selectscreenscheme.jsp</view> + <view name="error">/secure/project/views/issuefields/selectscreenscheme.jsp</view> + </action> + + <!-- Field Screen Schemes --> + <action name="admin.issuefields.screens.ViewFieldScreenSchemes" alias="ViewFieldScreenSchemes" roles-required="admin"> + <view name="error... [truncated message content] |
|
From: <jbo...@li...> - 2005-08-11 15:48:53
|
Author: adamw
Date: 2005-08-11 11:47:30 -0400 (Thu, 11 Aug 2005)
New Revision: 822
Modified:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/XmlInputFactory.java
Log:
Downloads extensions
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java 2005-08-11 12:54:04 UTC (rev 821)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java 2005-08-11 15:47:30 UTC (rev 822)
@@ -9,6 +9,8 @@
package org.jboss.forge.common.projects;
import java.io.IOException;
+import java.text.DateFormat;
+import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -262,6 +264,12 @@
public void fillContextShallow(PropertiesMap properties,
DelegateContext context) {
String id = properties.get("id").getFirstValue();
+ String pathToFile = separator + projectId
+ + separator + componentDir + separator
+ + pathCategoryContext + separator + id;
+
+ boolean outsideFile = false;
+
/*
* Checking if this is the link to a file is not an absolute
* one; if it is not, then we prepend the prefix that was
@@ -272,14 +280,31 @@
if ((id.startsWith("http://")) || (id.startsWith("ftp://"))) {
context.put("link", id);
context.put("size", properties.get("size").getFirstValue());
+ outsideFile = true;
} else {
context.put("link", downloadPrefix + pathCategoryContext
+ separator + id);
- context.put("size", getFileSize(isf, separator + projectId
- + separator + componentDir + separator
- + pathCategoryContext + separator + id));
+ context.put("size", getFileSize(isf, pathToFile));
}
+
+ context.put("license", properties.get("license").getFirstValue());
+
+ /*
+ * Adding release date information - trying to read it from the
+ * properties, and if there is no such info, auto-generating it.
+ */
+ if (properties.hasValues("release"))
+ context.put("release", properties.get("release").getFirstValue());
+ else
+ /*
+ * If this is an outside file, then we cannot determine its
+ * release date.
+ */
+ if (!outsideFile)
+ context.put("release", DateFormat.getDateInstance(
+ DateFormat.SHORT).format(
+ getFileModification(isf, pathToFile)));
}
public void fillContext(PropertiesMap properties,
@@ -296,6 +321,19 @@
}
/**
+ * Computes the last modification time of the given file.
+ *
+ * @param isf
+ * A factory of XML files.
+ * @param file
+ * Name of the file which last modification time should be computed.
+ * @return A date holding last modification of the given file.
+ */
+ private Date getFileModification(XmlInputFactory isf, String file) {
+ return new Date(isf.getLastModification(file));
+ }
+
+ /**
* Computes the length of the given file and returns it in a short form as a
* string with a proper suffix (MB, KB, B).
*
@@ -307,7 +345,7 @@
* given file.
*/
private String getFileSize(XmlInputFactory isf, String file) {
- long length = isf.getFileLength(file);
+ long length = isf.getLength(file);
String suffix = "B";
if (length >= 1048576) {
suffix = "MB";
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/XmlInputFactory.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/XmlInputFactory.java 2005-08-11 12:54:04 UTC (rev 821)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/XmlInputFactory.java 2005-08-11 15:47:30 UTC (rev 822)
@@ -63,16 +63,28 @@
}
/**
- * Gets the file length of a resource with the given identifier. Needed for
+ * Gets the length of a resource with the given identifier. Needed for
* the downloads descriptor.
*
* @param identifier
* Identifier of the resource to check.
* @return Length of the given resource.
*/
- public long getFileLength(String identifier) {
+ public long getLength(String identifier) {
return cm.getLength(identifier);
}
+
+ /**
+ * Gets the last modification time of a resource with the given identifier.
+ * Needed for the downloads descriptor.
+ *
+ * @param identifier
+ * Identifier of the resource to check.
+ * @return Last modification time of the given resource.
+ */
+ public long getLastModification(String identifier) {
+ return cm.getLastModification(identifier);
+ }
public static XmlInputFactory getContentReadingInstance(ContentManager cm) {
return new XmlInputFactory(cm);
|
|
From: <jbo...@li...> - 2005-08-11 12:55:30
|
Author: dam...@jb... Date: 2005-08-11 08:54:04 -0400 (Thu, 11 Aug 2005) New Revision: 821 Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties Log: reverted filedatasource.properties Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties 2005-08-11 08:15:52 UTC (rev 820) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties 2005-08-11 12:54:04 UTC (rev 821) @@ -1,4 +1,4 @@ # FileDataSource configuration file # pathToMedia - points, where JSPWiki file structure is situated -pathToMedia = /Volumes/JBoss/servers/labs/wiki +pathToMedia = /usr/local/forge/wiki |
|
From: <jbo...@li...> - 2005-08-11 08:17:12
|
Author: aron.gombas
Date: 2005-08-11 04:15:52 -0400 (Thu, 11 Aug 2005)
New Revision: 820
Modified:
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java
Log:
key <-> url mix fixed
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java 2005-08-11 08:15:05 UTC (rev 819)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java 2005-08-11 08:15:52 UTC (rev 820)
@@ -92,8 +92,8 @@
"return " +
"<dummy>" +
"{ data(fn:substring-after(fn:normalize-space($d/child::tr/child::td/child::h3/text()), ' ')) }|" +
+ "{ data(fn:substring-after(fn:substring-before($d/child::tr/child::td/child::h3/font/text(), ')'), ' ')) }|" +
"{ data($d/following-sibling::table/child::tr/child::td/child::p[1]/child::a[2]) }|" +
- "{ data(fn:substring-after(fn:substring-before($d/child::tr/child::td/child::h3/font, ')'), ' ')) }|" +
"{ data(fn:normalize-space(fn:string-join($d/following-sibling::table/child::tr/child::td/child::p[1]/text(), ''))) }|" +//!!! SPACE-EKET TRIMMEL
"{ data($d/following-sibling::table/child::tr/child::td/child::p[1]/child::a[1]) }" +
"</dummy>";
@@ -146,6 +146,7 @@
// scrape
for(Iterator itProject = resultProject.iterator(); itProject.hasNext();) {
String valueProject = ((NodeInfo)itProject.next()).getStringValue();
+ valueProject = valueProject.replaceAll("\\|\\|\\|", "| | |"); // to eliminate empty items
valueProject = valueProject.replaceAll("\\|\\|", "| |"); // to eliminate empty items
log.debug(String.format("Scraped project: \"%s\"", valueProject));
|
|
From: <jbo...@li...> - 2005-08-11 08:16:35
|
Author: aron.gombas
Date: 2005-08-11 04:15:05 -0400 (Thu, 11 Aug 2005)
New Revision: 819
Modified:
trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties
trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp
trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp
trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp
trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp
trunk/labs/kosmos/web-portlet/pages/sf_monitoring.jsp
trunk/labs/kosmos/web-portlet/pages/svn_monitoring.jsp
trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp
trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp
trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp
Log:
Cosmetical/UI changes
Modified: trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties 2005-08-11 05:37:16 UTC (rev 818)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties 2005-08-11 08:15:05 UTC (rev 819)
@@ -16,7 +16,7 @@
ccproject.failures=Failures
ccproject.errors=Errors
ccproject.tests=Tests Total
-ccproject.testsPerCategory=Tests Rate
+ccproject.testsPerCategory=Tests Success Rate
status.success=Success.
status.failure=Failure.
Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp 2005-08-11 05:37:16 UTC (rev 818)
+++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp 2005-08-11 08:15:05 UTC (rev 819)
@@ -32,25 +32,35 @@
</display:column>
<display:column titleKey="ccproject.successRate" sortProperty="successRate" sortable="true">
<c:if test="${projectsIt.tests > 0}">
- <c:if test="${projectsIt.successRate != 1.0}"><span class="portlet-msg-error"></c:if>
- <fmt:formatNumber value="${projectsIt.successRate}" type="percent"/>
- <c:if test="${projectsIt.successRate != 1.0}"></span></c:if>
-
- <table width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0" border="0">
+ <table valign="center">
<tr>
- <td style="background-color:#00FF00"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${100*projectsIt.successRate}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
- <td style="background-color:#FF0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.failures) / projectsIt.tests}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
- <td style="background-color:#DD0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.errors) / projectsIt.tests}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
+ <td>
+ <c:if test="${projectsIt.successRate != 1.0}"><span class="portlet-msg-error"></c:if>
+ <fmt:formatNumber value="${projectsIt.successRate}" type="percent"/>
+ <c:if test="${projectsIt.successRate != 1.0}"></span></c:if>
+ </td>
+ <td>
+
+ <table width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0" border="0">
+ <tr>
+ <td style="background-color:#00FF00"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${100*projectsIt.successRate}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
+ <td style="background-color:#FF0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.failures) / projectsIt.tests}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
+ <td style="background-color:#DD0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.errors) / projectsIt.tests}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
+ </tr>
+ </table>
+ </td>
+ <td>
+
+ <a href="<portlet:renderURL><portlet:param name="action" value="viewTestDetails"/><portlet:param name="id" value="<%= pageContext.getAttribute("id").toString() %>"/></portlet:renderURL>">
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="ccproject.testDetails"/>" border="0"/>
+ </a>
+ </td>
</tr>
- </table>
-
- <a href="<portlet:renderURL><portlet:param name="action" value="viewTestDetails"/><portlet:param name="id" value="<%= pageContext.getAttribute("id").toString() %>"/></portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="ccproject.testDetails"/>" border="0" align="right"/>
- </a>
+ </table>
</c:if>
</display:column>
- <display:column titleKey="ccproject.timestamp" sortProperty="timestamp" sortable="true">
- <fmt:formatDate value="${projectsIt.timestamp}" pattern="yyyy/MM/dd hh:mm:ss"/>
+ <display:column titleKey="ccproject.timestamp" style="white-space:nowrap" sortProperty="timestamp" sortable="true">
+ <fmt:formatDate value="${projectsIt.timestamp}" pattern="dd/MMM/yy hh:mm"/>
</display:column>
<display:footer>
<%@include file="includes/table_footer.jsp"%>
Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp 2005-08-11 05:37:16 UTC (rev 818)
+++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp 2005-08-11 08:15:05 UTC (rev 819)
@@ -48,9 +48,10 @@
</tr>
<tr class="portlet-section-alternate">
<td><fmt:message key="ccproject.testsPerCategory"/>:</td>
- <td><img src="<c:out value="${project.testsPerCategoryChartUrl}"/>"/></td>
+ <td><img src="<c:out value="${project.testsPerCategoryChartUrl}"/>" title="<fmt:message key="ccproject.testsPerCategory"/>"/></td>
<td valign="top">
TODO SOME TEST DETAILS SHOULD COME HERE?
+ MAYBE FAILED TESTS? OR ALL OF THEM?
</td>
</tr>
<%@include file="includes/table_footer.jsp"%>
Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp 2005-08-11 05:37:16 UTC (rev 818)
+++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp 2005-08-11 08:15:05 UTC (rev 819)
@@ -15,52 +15,60 @@
</c:otherwise>
</c:choose>
</display:column>
- <display:column titleKey="jiraproject.name" sortProperty="name" sortable="true">
+ <display:column titleKey="jiraproject.name" style="white-space:nowrap" sortProperty="name" sortable="true">
<a href="<c:out value="${projectsIt.url}"/>"><c:out value="${projectsIt.name}"/></a>
<a href="<portlet:renderURL><portlet:param name="action" value="viewProjectDetails"/><portlet:param name="id" value="<%= pageContext.getAttribute("id").toString() %>"/></portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="jiraproject.projectDetails"/>" border="0" align="right"/>
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="jiraproject.projectDetails"/>" border="0"/>
</a>
</display:column>
- <display:column titleKey="jiraproject.key" property="key" sortable="true"/>
- <display:column titleKey="jiraproject.lead" property="lead" sortable="true"/>
- <display:column titleKey="jiraproject.openIssues" sortProperty="openIssues" sortable="true">
+ <display:column titleKey="jiraproject.key" style="white-space:nowrap" property="key" sortable="true"/>
+ <display:column titleKey="jiraproject.lead" style="white-space:nowrap" property="lead" sortable="true"/>
+ <display:column titleKey="jiraproject.openIssues" style="white-space:nowrap" sortProperty="openIssues" sortable="true">
<c:if test="${projectsIt.openIssues > 10}"><span class="portlet-msg-error"></c:if>
<c:out value="${projectsIt.openIssues}"/>
(<fmt:formatNumber value="${projectsIt.openIssues / projectsIt.totalIssues}" type="percent"/>)
<c:if test="${projectsIt.openIssues > 10}"></span></c:if>
</display:column>
- <display:column titleKey="jiraproject.codingInProgressIssues" sortProperty="codingInProgressIssues" sortable="true">
+ <display:column titleKey="jiraproject.codingInProgressIssues" style="white-space:nowrap" sortProperty="codingInProgressIssues" sortable="true">
<c:out value="${projectsIt.codingInProgressIssues}"/>
(<fmt:formatNumber value="${projectsIt.codingInProgressIssues / projectsIt.totalIssues}" type="percent"/>)
</display:column>
- <display:column titleKey="jiraproject.reopenedIssues" sortProperty="reopenedIssues" sortable="true">
+ <display:column titleKey="jiraproject.reopenedIssues" style="white-space:nowrap" sortProperty="reopenedIssues" sortable="true">
<c:out value="${projectsIt.reopenedIssues}"/>
(<fmt:formatNumber value="${projectsIt.reopenedIssues / projectsIt.totalIssues}" type="percent"/>)
</display:column>
- <display:column titleKey="jiraproject.resolvedIssues" sortProperty="resolvedIssues" sortable="true">
+ <display:column titleKey="jiraproject.resolvedIssues" style="white-space:nowrap" sortProperty="resolvedIssues" sortable="true">
<c:out value="${projectsIt.resolvedIssues}"/>
(<fmt:formatNumber value="${projectsIt.resolvedIssues / projectsIt.totalIssues}" type="percent"/>)
</display:column>
- <display:column titleKey="jiraproject.closedIssues" sortProperty="closedIssues" sortable="true">
+ <display:column titleKey="jiraproject.closedIssues" style="white-space:nowrap" sortProperty="closedIssues" sortable="true">
<c:out value="${projectsIt.closedIssues}"/>
(<fmt:formatNumber value="${projectsIt.closedIssues / projectsIt.totalIssues}" type="percent"/>)
</display:column>
<display:column titleKey="jiraproject.issuesByStatus" sortProperty="openIssues" sortable="true">
<c:if test="${projectsIt.totalIssues > 0}">
- <table width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0" border="0">
+ <table valign="center">
<tr>
- <td style="background-color:#FF0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.openIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
- <td style="background-color:#FFFF00"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.codingInProgressIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
- <td style="background-color:#DD0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.reopenedIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
- <td style="background-color:#00FF00"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.resolvedIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
- <td style="background-color:#DDDDDD"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.closedIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
+ <td>
+ <table width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0" border="0">
+ <tr>
+ <td style="background-color:#FF0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.openIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
+ <td style="background-color:#FFFF00"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.codingInProgressIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
+ <td style="background-color:#DD0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.reopenedIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
+ <td style="background-color:#00FF00"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.resolvedIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
+ <td style="background-color:#DDDDDD"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.closedIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
+ </tr>
+ </table>
+ </td>
+ <td>
+
+ <a href="<portlet:renderURL><portlet:param name="action" value="viewIssueDetails"/><portlet:param name="id" value="<%= pageContext.getAttribute("id").toString() %>"/></portlet:renderURL>">
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="jiraproject.issueDetails"/>" border="0"/>
+ </a>
+ </td>
</tr>
- </table>
-
- <a href="<portlet:renderURL><portlet:param name="action" value="viewIssueDetails"/><portlet:param name="id" value="<%= pageContext.getAttribute("id").toString() %>"/></portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="jiraproject.issueDetails"/>" border="0" align="right"/>
- </a>
+ </table>
</c:if>
</display:column>
<display:footer>
Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp 2005-08-11 05:37:16 UTC (rev 818)
+++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp 2005-08-11 08:15:05 UTC (rev 819)
@@ -6,7 +6,7 @@
<table>
<tr class="portlet-section-body">
<td><fmt:message key="jiraproject.openIssuesByPriority"/>:</td>
- <td><img src="<c:out value="${project.openIssuesPerPriorityChartUrl}"/>"/></td>
+ <td><img src="<c:out value="${project.openIssuesPerPriorityChartUrl}"/>" title="<fmt:message key="jiraproject.openIssuesByPriority"/>"/></td>
<td valign="top">
<table>
<tr class="portlet-section-alternate">
@@ -32,9 +32,8 @@
</tr>
<tr class="portlet-section-alternate">
<td><fmt:message key="jiraproject.openIssuesByAssignee"/>:</td>
- <td><img src="<c:out value="${project.openIssuesPerAssigneeChartUrl}"/>"/></td>
+ <td><img src="<c:out value="${project.openIssuesPerAssigneeChartUrl}"/>" title="<fmt:message key="jiraproject.openIssuesByAssignee"/>"/></td>
<td valign="top">
-
<table>
<c:forEach var="item" items="${project.issuesPerAssignee}" varStatus="status">
<c:if test="${status.index < 8}">
@@ -45,8 +44,7 @@
</tr>
</c:if>
</c:forEach>
- </table>
-
+ </table>
</td>
</tr>
<%@include file="includes/table_footer.jsp"%>
Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp 2005-08-11 05:37:16 UTC (rev 818)
+++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp 2005-08-11 08:15:05 UTC (rev 819)
@@ -16,7 +16,7 @@
</tr>
<tr class="portlet-section-body">
<td><fmt:message key="jiraproject.issuesByStatus"/>:</td>
- <td><img src="<c:out value="${project.issuesPerStatusChartUrl}"/>"/></td>
+ <td><img src="<c:out value="${project.issuesPerStatusChartUrl}"/>" title="<fmt:message key="jiraproject.issuesByStatus"/>"/></td>
<td valign="top">
<table>
<tr class="portlet-section-alternate">
Modified: trunk/labs/kosmos/web-portlet/pages/sf_monitoring.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/sf_monitoring.jsp 2005-08-11 05:37:16 UTC (rev 818)
+++ trunk/labs/kosmos/web-portlet/pages/sf_monitoring.jsp 2005-08-11 08:15:05 UTC (rev 819)
@@ -17,16 +17,16 @@
</c:otherwise>
</c:choose>
</display:column>
- <display:column titleKey="sfRelease.packageName" sortProperty="packageName" sortable="true">
+ <display:column titleKey="sfRelease.packageName" style="white-space:nowrap" sortProperty="packageName" sortable="true">
<a href="<c:out value="${releasesIt.packageUrl}"/>"><c:out value="${releasesIt.packageName}"/></a>
</display:column>
- <display:column titleKey="sfRelease.version" sortProperty="version" sortable="true">
+ <display:column titleKey="sfRelease.version" style="white-space:nowrap" sortProperty="version" sortable="true">
<a href="<c:out value="${releasesIt.versionUrl}"/>"><c:out value="${releasesIt.version}"/></a>
</display:column>
- <display:column titleKey="sfRelease.date" sortProperty="date" sortable="true">
- <fmt:formatDate value="${releasesIt.date}" pattern="yyyy/MM/dd"/>
+ <display:column titleKey="sfRelease.date" style="white-space:nowrap" sortProperty="date" sortable="true">
+ <fmt:formatDate value="${releasesIt.date}" pattern="dd/MMM/yy"/>
</display:column>
- <display:column titleKey="sfRelease.age" sortProperty="age" sortable="true">
+ <display:column titleKey="sfRelease.age" style="white-space:nowrap" sortProperty="age" sortable="true">
<c:if test="${releasesIt.ageInDays < 7}"><span class="portlet-msg-alert"></c:if>
<c:if test="${releasesIt.ageInDays > 365}"><span class="portlet-msg-error"></c:if>
<fmt:formatNumber value="${releasesIt.ageInDays}"/> <fmt:message key="sfRelease.age.days"/>
Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/svn_monitoring.jsp 2005-08-11 05:37:16 UTC (rev 818)
+++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring.jsp 2005-08-11 08:15:05 UTC (rev 819)
@@ -15,33 +15,33 @@
</c:otherwise>
</c:choose>
</display:column>
- <display:column titleKey="svnrepository.location" sortProperty="location" sortable="true">
+ <display:column titleKey="svnrepository.location" style="white-space:nowrap" sortProperty="location" sortable="true">
<a href="<c:out value="${repositoriesIt.location}"/>"><c:out value="${repositoriesIt.location}"/></a>
<a href="<portlet:renderURL><portlet:param name="action" value="viewRepositoryDetails"/><portlet:param name="id" value="<%= pageContext.getAttribute("id").toString() %>"/></portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="svnrepository.repositoryDetails"/>" border="0" align="right"/>
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="svnrepository.repositoryDetails"/>" border="0"/>
</a>
</display:column>
- <display:column titleKey="svnrepository.revision" sortProperty="revision" sortable="true">
+ <display:column titleKey="svnrepository.revision" style="white-space:nowrap" sortProperty="revision" sortable="true">
<c:out value="${repositoriesIt.revision}"/>
<a href="<portlet:renderURL><portlet:param name="action" value="viewRevisionDetails"/><portlet:param name="id" value="<%= pageContext.getAttribute("id").toString() %>"/></portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="svnrepository.revisionDetails"/>" border="0" align="right"/>
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="svnrepository.revisionDetails"/>" border="0"/>
</a>
</display:column>
- <display:column titleKey="svnrepository.activityLast7Days" sortProperty="activity" sortable="true">
+ <display:column titleKey="svnrepository.activityLast7Days" style="white-space:nowrap" sortProperty="activity" sortable="true">
<c:if test="${repositoriesIt.activity < 0.5}"><span class="portlet-msg-error"></c:if>
<fmt:formatNumber value="${repositoriesIt.activity}" type="percent" minFractionDigits="1" maxFractionDigits="1"/>
<c:if test="${repositoriesIt.activity < 0.5}"></span></c:if>
<a href="<portlet:renderURL><portlet:param name="action" value="viewActivityDetails"/><portlet:param name="id" value="<%= pageContext.getAttribute("id").toString() %>"/></portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="svnrepository.activityDetails"/>" border="0" align="right"/>
+ <img src="<%= renderRequest.getContextPath() %>/pages/images/info.gif" title="<fmt:message key="svnrepository.activityDetails"/>" border="0"/>
</a>
</display:column>
- <display:column titleKey="svnrepository.latestTouchDate" sortProperty="latestTouchDate" sortable="true">
- <fmt:formatDate value="${repositoriesIt.latestTouchDate}" pattern="yyyy/MM/dd hh:mm:ss"/>
+ <display:column titleKey="svnrepository.latestTouchDate" style="white-space:nowrap" sortProperty="latestTouchDate" sortable="true">
+ <fmt:formatDate value="${repositoriesIt.latestTouchDate}" pattern="dd/MMM/yy hh:mm"/>
</display:column>
- <display:column titleKey="svnrepository.latestTouchAge" sortProperty="latestTouchAge" sortable="true">
+ <display:column titleKey="svnrepository.latestTouchAge" style="white-space:nowrap" sortProperty="latestTouchAge" sortable="true">
<c:if test="${repositoriesIt.latestTouchAgeInDays > 7}"><span class="portlet-msg-error"></c:if>
<c:out value="${repositoriesIt.latestTouchAgeInDays}"/> <fmt:message key="svnrepository.latestTouchAge.days"/>
<c:if test="${repositoriesIt.latestTouchAgeInDays > 7}"></span></c:if>
Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp 2005-08-11 05:37:16 UTC (rev 818)
+++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp 2005-08-11 08:15:05 UTC (rev 819)
@@ -26,7 +26,7 @@
</tr>
<tr class="portlet-section-body">
<td><fmt:message key="svnrepository.commitHistory"/>:</td>
- <td><img src="<c:out value="${repository.commitsPerWeekChartUrl}"/>"/></td>
+ <td><img src="<c:out value="${repository.commitsPerWeekChartUrl}"/>" title="<fmt:message key="svnrepository.commitHistory"/>"/></td>
<td valign="top">
TODO LATEST 8 MODIFICATIONS COME HERE
</td>
Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp 2005-08-11 05:37:16 UTC (rev 818)
+++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp 2005-08-11 08:15:05 UTC (rev 819)
@@ -22,7 +22,7 @@
</tr>
<tr class="portlet-section-body">
<td><fmt:message key="svnrepository.repositoryEntryHistory"/>:</td>
- <td><img src="<c:out value="${repository.repoEntriesPerWeekChartUrl}"/>"/></td>
+ <td><img src="<c:out value="${repository.repoEntriesPerWeekChartUrl}"/>" title="<fmt:message key="svnrepository.repositoryEntryHistory"/>"/></td>
</tr>
<%@include file="includes/table_footer.jsp"%>
</table>
Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp 2005-08-11 05:37:16 UTC (rev 818)
+++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp 2005-08-11 08:15:05 UTC (rev 819)
@@ -16,7 +16,7 @@
</tr>
<tr class="portlet-section-body">
<td><fmt:message key="svnrepository.mostActiveCommitters"/>:</td>
- <td><img src="<c:out value="${repository.commitsPerAuthorChartUrl}"/>"/></td>
+ <td><img src="<c:out value="${repository.commitsPerAuthorChartUrl}"/>" title="<fmt:message key="svnrepository.mostActiveCommitters"/>"/></td>
<td valign="top">
<table>
<c:forEach var="item" items="${repository.commitsPerAuthor}" varStatus="status">
@@ -33,7 +33,7 @@
</tr>
<tr class="portlet-section-alternate">
<td><fmt:message key="svnrepository.mostActiveFiles"/>:</td>
- <td><img src="<c:out value="${repository.commitsPerFileChartUrl}"/>"/></td>
+ <td><img src="<c:out value="${repository.commitsPerFileChartUrl}"/>" title="<fmt:message key="svnrepository.mostActiveFiles"/>"/>"/></td>
<td valign="top">
<table>
<c:forEach var="item" items="${repository.commitsPerFile}" varStatus="status">
|
|
From: <jbo...@li...> - 2005-08-11 05:39:07
|
Author: dam...@jb...
Date: 2005-08-11 01:37:16 -0400 (Thu, 11 Aug 2005)
New Revision: 818
Modified:
trunk/forge/portal-extensions/forge-wiki/project.xml
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/PluginDescriptor.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPluginChain.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiProperties.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeDescriptor.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties
trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
Added a bunch of comments.. usual things, like author (i.e., me!).
Also, added the JBossWiki logo as the title... instead of Szimano Wiki! 8-b
Modified: trunk/forge/portal-extensions/forge-wiki/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-11 05:37:16 UTC (rev 818)
@@ -14,8 +14,7 @@
<name>Tomasz Szymanski</name>
<url>http://mamut.net.pl</url>
</organization>
- <description></description>
-
+
<dependency>
<groupId>aslibs</groupId>
<artifactId>javax.servlet</artifactId>
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/PluginDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/PluginDescriptor.java 2005-08-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/PluginDescriptor.java 2005-08-11 05:37:16 UTC (rev 818)
@@ -1,4 +1,18 @@
+/**************************************************
+ * *
+ * JBoss Labs: Creating Professional Open Source *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *************************************************/
package org.jboss.wiki;
+/**
+ *
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
+ * @version $Id$
+ */
/**
* <p></p>
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java 2005-08-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java 2005-08-11 05:37:16 UTC (rev 818)
@@ -1,5 +1,19 @@
+/**************************************************
+ * *
+ * JBoss Labs: Creating Professional Open Source *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *************************************************/
package org.jboss.wiki;
+/**
+ *
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
+ * @version $Id$
+ */
import org.jboss.portal.core.model.User;
/**
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-11 05:37:16 UTC (rev 818)
@@ -1,3 +1,11 @@
+/**************************************************
+ * *
+ * JBoss Labs: Creating Professional Open Source *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *************************************************/
package org.jboss.wiki;
import java.util.HashMap;
@@ -4,8 +12,11 @@
import java.util.Map;
/**
- * <p></p>
- *
+ *
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
+ * @version $Id$
+ *
* getLink - gets a link to a given page
* getEditLink - same but link to edit that page
* save - saves page with given attributes
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java 2005-08-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java 2005-08-11 05:37:16 UTC (rev 818)
@@ -1,3 +1,11 @@
+/**************************************************
+ * *
+ * JBoss Labs: Creating Professional Open Source *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *************************************************/
package org.jboss.wiki;
import java.io.Serializable;
@@ -7,6 +15,12 @@
* <p></p>
*
*/
+ /**
+ *
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
+ * @version $Id$
+ */
public class WikiPage implements Serializable, WikiProperties {
/**
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java 2005-08-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java 2005-08-11 05:37:16 UTC (rev 818)
@@ -1,3 +1,11 @@
+/**************************************************
+ * *
+ * JBoss Labs: Creating Professional Open Source *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *************************************************/
package org.jboss.wiki;
/**
@@ -4,6 +12,12 @@
* <p></p>
*
*/
+/**
+ *
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
+ * @version $Id$
+ */
public interface WikiPlugin {
/**
* <p></p>
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPluginChain.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPluginChain.java 2005-08-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPluginChain.java 2005-08-11 05:37:16 UTC (rev 818)
@@ -1,3 +1,11 @@
+/**************************************************
+ * *
+ * JBoss Labs: Creating Professional Open Source *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *************************************************/
package org.jboss.wiki;
import java.util.List;
@@ -6,6 +14,12 @@
* <p></p>
*
*/
+ /**
+ *
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
+ * @version $Id$
+ */
public class WikiPluginChain {
/**
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-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-11 05:37:16 UTC (rev 818)
@@ -1,12 +1,11 @@
-/*****************************************
- * *
- * JBoss Portal: The OpenSource Portal *
- * *
- * Distributable under LGPL license. *
- * See terms of license at gnu.org. *
- * *
- *****************************************/
-
+/**************************************************
+ * *
+ * JBoss Labs: Creating Professional Open Source *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *************************************************/
package org.jboss.wiki;
import java.util.Date;
@@ -16,6 +15,14 @@
import javax.portlet.*;
import org.jboss.portlet.*;
+/**
+ * The WikiPortlet.<p>
+ *
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szimanski</a>
+ * @version $Id$
+ */
+
public class WikiPortlet extends JBossPortlet {
final static String jspPath = "/WEB-INF/jsp/";
@@ -142,7 +149,7 @@
rReq.setAttribute("actionURL", wikiURL.toString());
- rReq.setAttribute("wikiName", "Szimano Wiki");
+ rReq.setAttribute("wikiName", "<img src=\"/file-access/default/members/jbosswiki/images/JBossWikiLogoMedium.png\" width=\"100\" />");
WikiPage pageToShow = wikiEngine.getByName(wikiPage, wikiContext);
@@ -154,9 +161,7 @@
pageToShow = wikiEngine.getByName(wikiPage, wikiContext);
}
- rReq.setAttribute("wikiContent", (page == "Wiki.jsp") ? translateLinks(
- pageToShow.getContent(), wikiURL.toString()) : pageToShow
- .getContent());
+ rReq.setAttribute("wikiContent", (page == "Wiki.jsp") ? translateLinks(pageToShow.getContent(), wikiURL.toString()) : pageToShow.getContent());
rReq.setAttribute("wikiPage", wikiPage);
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiProperties.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiProperties.java 2005-08-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiProperties.java 2005-08-11 05:37:16 UTC (rev 818)
@@ -1,3 +1,11 @@
+/**************************************************
+ * *
+ * JBoss Labs: Creating Professional Open Source *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *************************************************/
package org.jboss.wiki;
@@ -5,6 +13,12 @@
* <p></p>
*
*/
+/**
+ *
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
+ * @version $Id$
+ */
public interface WikiProperties {
/**
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-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-11 05:37:16 UTC (rev 818)
@@ -1,3 +1,11 @@
+/**************************************************
+ * *
+ * JBoss Labs: Creating Professional Open Source *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *************************************************/
package org.jboss.wiki;
import java.util.List;
@@ -6,6 +14,12 @@
* <p></p>
*
*/
+ /**
+ *
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
+ * @version $Id$
+ */
public class WikiType {
/**
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeDescriptor.java 2005-08-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeDescriptor.java 2005-08-11 05:37:16 UTC (rev 818)
@@ -1,3 +1,11 @@
+/**************************************************
+ * *
+ * JBoss Labs: Creating Professional Open Source *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *************************************************/
package org.jboss.wiki;
import java.util.List;
@@ -2,6 +10,8 @@
-/**
- * <p></p>
- *
- */
+ /**
+ *
+ * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
+ * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
+ * @version $Id$
+ */
public class WikiTypeDescriptor {
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties 2005-08-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties 2005-08-11 05:37:16 UTC (rev 818)
@@ -1,4 +1,4 @@
# FileDataSource configuration file
# pathToMedia - points, where JSPWiki file structure is situated
-pathToMedia = /usr/local/forge/wiki
+pathToMedia = /Volumes/JBoss/servers/labs/wiki
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-11 04:43:24 UTC (rev 817)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-11 05:37:16 UTC (rev 818)
@@ -15,7 +15,7 @@
org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author");
%>
-<h2><%=wikiName%>: <%=wikiPage%></h2>
+<h2><%=wikiName%>/ <%=wikiPage%></h2>
<div style="text-align: right;">
<form method="post" action="<%=actionURL%>">
|
|
From: <jbo...@li...> - 2005-08-11 04:45:00
|
Author: ral...@jb...
Date: 2005-08-11 00:43:24 -0400 (Thu, 11 Aug 2005)
New Revision: 817
Added:
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiContext.txt
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiSyntax.txt
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiTranslator.txt
Log:
the skeleton of the HTML parser for wiki - a lot more to finish
Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiContext.txt
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiContext.txt 2005-08-11 03:49:18 UTC (rev 816)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiContext.txt 2005-08-11 04:43:24 UTC (rev 817)
@@ -0,0 +1,107 @@
+/*
+ * Created on Aug 9, 2005
+ *
+ *
+ */
+
+/**
+ * @author rali
+ *
+ *
+ */
+package org.jboss.wiki.plugins;
+//import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+/**
+ * Provides state information throughout the processing of a page. A
+ * WikiContext is born when the JSP pages that are the main entry
+ * points, are invoked. The JSPWiki engine creates the new
+ * WikiContext, which basically holds information about the page, the
+ * handling engine, and in which context (view, edit, etc) the
+ * call was done.
+ * <P>
+ * A WikiContext also provides request-specific variables, which can
+ * be used to communicate between plugins on the same page, or
+ * between different instances of the same plugin. A WikiContext
+ * variable is valid until the processing of the page has ended. For
+ * an example, please see the Counter plugin.
+ *
+ * @see com.ecyrd.jspwiki.plugin.Counter
+ *
+ * @author Janne Jalkanen
+ */
+public class WikiContext
+{
+ String m_requestContext = VIEW;
+
+ Map m_variableMap = new HashMap();
+
+ /** The VIEW context - the user just wants to view the page
+ contents. */
+ public static final String VIEW = "view";
+
+ /** The EDIT context - the user is editing the page. */
+ public static final String EDIT = "edit";
+
+ /** User is preparing for a login/authentication. */
+ public static final String LOGIN = "login";
+
+ /** User is viewing a DIFF between the two versions of the page. */
+ public static final String DIFF = "diff";
+
+ /** User is viewing page history. */
+ public static final String INFO = "info";
+
+ /** User is previewing the changes he just made. */
+ public static final String PREVIEW = "preview";
+
+ /** User has an internal conflict, and does quite not know what to
+ do. Please provide some counseling. */
+ public static final String CONFLICT = "conflict";
+
+ /** An error has been encountered and the user needs to be informed. */
+ public static final String ERROR = "error";
+
+ public static final String UPLOAD = "upload";
+
+ public static final String COMMENT = "comment";
+
+ //INSTEAD OF PROP FILE
+ /**
+ * The default inlining pattern. Currently "*.png"
+ */
+ public final String DEFAULT_INLINEPATTERN = "*.png";
+ /**
+ * This property defines the inline image pattern.
+ */
+ public final String[] PROP_INLINEIMAGEPTRN = {"*.png","*.jpeg","*.gif"};
+
+ /** If true, consider CamelCase hyperlinks as well. */
+ public final String PROP_CAMELCASELINKS = "true";
+
+ /**
+ * If true, all hyperlinks are translated as well, regardless whether they
+ * are surrounded by brackets.
+ */
+ public final String PROP_PLAINURIS = "false";
+
+ /**
+ * If true, all outward links (external links) have a small link image
+ * appended.
+ */
+ public final String PROP_USEOUTLINKIMAGE = "true";
+
+ /**
+ * If set to "true", allows using raw HTML within Wiki text. Be warned, this
+ * is a VERY dangerous option to set - never turn this on in a publicly
+ * allowable Wiki, unless you are absolutely certain of what you're doing.
+ */
+ public static final String PROP_ALLOWHTML = "false";
+
+
+}
+
Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiSyntax.txt
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiSyntax.txt 2005-08-11 03:49:18 UTC (rev 816)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiSyntax.txt 2005-08-11 04:43:24 UTC (rev 817)
@@ -0,0 +1,29 @@
+/*
+ * Created on Aug 9, 2005
+ *
+ *
+ */
+
+/**
+ * @author rali
+ *
+ * Defines basic Wiki syntax,
+ * later to be changed into dtd ?
+ *
+ */
+package org.jboss.wiki.plugins;
+
+public class WikiSyntax {
+ public static final String newLine = "\\";
+ public static final String bold = "__";
+ public static final String italic = "''";
+ public static final String horizontalRuler = "---";
+ public static final String preformatted_begin = "{{{";
+ public static final String preformatted_end = "}}}";
+ public static final String teletype_begin = "{{";
+ public static final String teletype_end = "}}";
+ public static final String table = "|";
+
+public static void hasle()
+{}
+}
Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiTranslator.txt
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiTranslator.txt 2005-08-11 03:49:18 UTC (rev 816)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/WikiTranslator.txt 2005-08-11 04:43:24 UTC (rev 817)
@@ -0,0 +1,1522 @@
+package org.jboss.wiki.plugins;
+
+import java.io.*;
+import java.util.*;
+
+import org.apache.log4j.Category;
+import org.apache.oro.text.*;
+import org.apache.oro.text.regex.*;
+
+public class WikiTranslator extends Reader {
+ public static final int READ = 0;
+
+ public static final int EDIT = 1;
+
+ private static final int EMPTY = 2; // Empty message
+
+ private static final int LOCAL = 3;
+
+ private static final int LOCALREF = 4;
+
+ private static final int IMAGE = 5;
+
+ private static final int EXTERNAL = 6;
+
+ private static final int INTERWIKI = 7;
+
+ private static final int IMAGELINK = 8;
+
+ private static final int IMAGEWIKILINK = 9;
+
+ public static final int ATTACHMENT = 10;
+
+ private static final int ATTACHMENTIMAGE = 11;
+
+ private boolean m_isbold = false;
+
+ private boolean m_isitalic = false;
+
+ private boolean m_isTypedText = false;
+
+ private boolean m_istable = false;
+
+ private boolean m_isPre = false;
+
+ private boolean m_isdefinition = false;
+
+ private int m_listlevel = 0;
+
+ private int m_numlistlevel = 0;
+
+ private String encoding = "UTF-8";
+
+ /** Keeps image regexp Patterns */
+ private ArrayList m_inlineImagePatterns;
+
+ private PatternMatcher m_inlineMatcher = new Perl5Matcher();
+
+ private static final int PUSHBACK_BUFFER_SIZE = 8;
+
+ private PushbackReader m_in;
+
+ private StringReader m_data = new StringReader("");
+ private String m_closeTag = null;
+
+ private static Category log = Category.getInstance(WikiTranslator.class);
+
+ //FIXME this is temporary implementation of keeping track of wiki pages
+ private static ArrayList existingPages;
+
+ //all prefixes and parts that form the links to attachments, images, wiki
+ // pages
+ // should be set through forge-common? or in a similar way at least
+
+ private final String BASE_URL = "http://forge.sicore.org:8080/portal/index.html?ctrl:id=window.default.WikiPortletWindow";
+
+ private final String VIEW_PATH = "";
+
+ private final String EDIT_PATH = "";
+
+ private final String ATTACH_PATH = "";
+
+ private final String IMAGE_PATH = null;//not used
+
+ //wiki properties variables, currently not used
+
+ /** If true, then considers CamelCase links as well. */
+ private boolean m_camelCaseLinks = false;
+
+ /** If true, consider URIs that have no brackets as well. */
+ // FIXME: Currently reserved, but not used.
+ private boolean m_plainUris = false;
+
+ /** If true, all outward links use a small link image. */
+ private boolean m_useOutlinkImage = true;
+
+ /** If true, allows raw HTML. */
+ private boolean m_allowHTML = false;
+
+ /**
+ * These characters constitute word separators when trying to find CamelCase
+ * links.
+ */
+ private static final String WORD_SEPARATORS = ",.|:;+=&";
+
+ private PatternMatcher m_matcher = new Perl5Matcher();
+
+ private PatternCompiler m_compiler = new Perl5Compiler();
+
+
+ private Pattern m_camelCasePtrn;
+
+ //contructor
+ public WikiTranslator(Reader in, WikiContext context) {
+ PatternCompiler compiler = new GlobCompiler();
+ ArrayList compiledpatterns = new ArrayList();
+
+ m_in = new PushbackReader(new BufferedReader(in), PUSHBACK_BUFFER_SIZE);
+
+ Collection ptrns = getImagePatterns(context);
+ ptrns.add(context.DEFAULT_INLINEPATTERN);
+
+ //
+ // Make them into Regexp Patterns. Unknown patterns
+ // are ignored.
+ //
+ for (Iterator i = ptrns.iterator(); i.hasNext();) {
+ try {
+ compiledpatterns.add(compiler.compile((String) i.next()));
+ } catch (MalformedPatternException e) {
+ log.error("Malformed pattern in properties: ", e);
+ }
+ }
+
+ m_inlineImagePatterns = compiledpatterns;
+
+ try {
+ m_camelCasePtrn = m_compiler.
+ compile("^([[:^alnum:]]*|\\~)([[:upper:]]+[[:lower:]]+[[:upper:]]+[[:alnum:]]*)[[:^alnum:]]*$");
+ } catch (MalformedPatternException e) {
+ log.fatal("Internal error: Someone put in a faulty pattern.", e);
+ //throw new InternalWikiException("Faulty camelcasepattern in
+ // TranslatorReader");
+ }
+
+ //
+ // Set the properties.
+ //
+ // Properties props = m_engine.getWikiProperties();
+
+ }
+
+ /**
+ * @param context
+ * @return
+ */
+ private Collection getImagePatterns(WikiContext context) {
+ ArrayList patterns = new ArrayList();
+ for (int i = 0; i < context.PROP_INLINEIMAGEPTRN.length; i++) {
+ patterns.add(context.PROP_INLINEIMAGEPTRN[i]);
+ }
+
+ return patterns;
+ }
+
+ /**
+ * Figures out if a link is an off-site link. This recognizes the most
+ * common protocols by checking how it starts.
+ */
+ private boolean isExternalLink(String link) {
+ return link.startsWith("http:") || link.startsWith("ftp:")
+ || link.startsWith("https:") || link.startsWith("mailto:")
+ || link.startsWith("news:") || link.startsWith("file:");
+ }
+
+ /**
+ * Matches the given link to the list of image name patterns to determine
+ * whether it should be treated as an inline image or not.
+ */
+ private boolean isImageLink(String link) {
+ for (Iterator i = m_inlineImagePatterns.iterator(); i.hasNext();) {
+ if (m_inlineMatcher.matches(link, (Pattern) i.next()))
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Checks for the existence of a traditional style CamelCase link.
+ * <P>
+ * We separate all white-space -separated words, and feed it to this routine
+ * to find if there are any possible camelcase links. For example, if "word"
+ * is "__HyperLink__" we return "HyperLink".
+ *
+ * @param word
+ * A phrase to search in.
+ * @return The match within the phrase. Returns null, if no CamelCase
+ * hyperlink exists within this phrase.
+ */
+ private String checkForCamelCaseLink(String word) {
+ PatternMatcherInput input;
+
+ input = new PatternMatcherInput(word);
+
+ if (m_matcher.contains(input, m_camelCasePtrn)) {
+ MatchResult res = m_matcher.getMatch();
+
+ int start = res.beginOffset(2);
+ int end = res.endOffset(2);
+
+ String link = res.group(2);
+ String matchedLink;
+
+ if (res.group(1) != null) {
+ if (res.group(1).equals("~") || res.group(1).indexOf('[') != -1) {
+ // Delete the (~) from beginning.
+ // We'll make '~' the generic kill-processing-character from
+ // now on.
+ return null;
+ }
+ }
+
+ return link;
+ } // if match
+
+ return null;
+ }
+
+ /**
+ * When given a link to a WikiName, we just return a proper HTML link for
+ * it. The local link mutator chain is also called.
+ */
+ private String makeCamelCaseLink(String wikiname) {
+ String matchedLink;
+ String link;
+
+ if ((matchedLink = linkExists(wikiname)) != null) {
+ link = makeLink(READ, matchedLink, wikiname);
+ } else {
+ link = makeLink(EDIT, wikiname, wikiname);
+ }
+
+ return link;
+ }
+
+ /**
+ * returns the name of the page if it exists, null otherwise
+ *
+ * @param wikiname
+ * @return
+ */
+ private String linkExists(String wikiname) {
+ int occurence = existingPages.indexOf(wikiname);
+ if (occurence != -1) {
+ return (String) existingPages.get(occurence);
+ } else
+ //doesnt exist, needs to be created somewhere*
+ return null;
+ }
+
+ /**
+ * Write a HTMLized link depending on its type. The link mutator chain is
+ * processed.
+ *
+ * @param type
+ * Type of the link.
+ * @param link
+ * The actual link.
+ * @param text
+ * The user-visible text for the link.
+ */
+ public String makeLink(int type, String link, String text) {
+ String result;
+
+ if (text == null)
+ text = link;
+
+ // Make sure we make a link name that can be accepted
+ // as a valid URL.
+
+ String encodedlink = encodeName(link);
+
+ if (encodedlink.length() == 0) {
+ type = EMPTY;
+ }
+
+ // text = callMutatorChain( m_linkMutators, text );
+
+ switch (type) {
+ case READ:
+ result = "<A CLASS=\"wikipage\" HREF=\"" + getViewURL(link) + "\">"
+ + text + "</A>";//just display a wiki page
+ break;
+
+ case EDIT:
+ result = "<U>" + text + "</U><A HREF=\"" + getEditURL(link)
+ + "\">?</A>";
+ break;
+
+ case EMPTY:
+ result = "<U>" + text + "</U>";
+ break;
+
+ //
+ // These two are for local references - footnotes and
+ // references to footnotes.
+ // We embed the page name (or whatever WikiContext gives us)
+ // to make sure the links are unique across Wiki.
+ //
+ case LOCALREF:
+ result = "<A CLASS=\"footnoteref\" HREF=\"#ref-" +
+ //m_context.getPage().getName()+"-"+
+ link + "\">[" + text + "]</A>";
+ break;
+ //FIXME change link
+ case LOCAL:
+ result = "<A CLASS=\"footnote\" NAME=\"ref-" +
+ //m_context.getPage().getName()+
+ "-" + link.substring(1) + "\">[" + text + "]</A>";
+ break;
+
+ //
+ // With the image, external and interwiki types we need to
+ // make sure nobody can put in Javascript or something else
+ // annoying into the links themselves. We do this by preventing
+ // a haxor from stopping the link name short with quotes in
+ // fillBuffer().
+ //
+ case IMAGE:
+ result = "<IMG CLASS=\"inline\" SRC=\"" + link + "\" ALT=\"" + text
+ + "\" />";
+ break;
+
+ case IMAGELINK:
+ result = "<A HREF=\"" + text + "\"><IMG CLASS=\"inline\" SRC=\""
+ + link + "\" /></A>";
+ break;
+
+ case IMAGEWIKILINK:
+ String pagelink = getViewURL(text);
+ result = "<A CLASS=\"wikipage\" HREF=\"" + pagelink
+ + "\"><IMG CLASS=\"inline\" SRC=\"" + link + "\" ALT=\""
+ + text + "\" /></A>";
+ break;
+
+ case EXTERNAL:
+ result = "<A CLASS=\"external\" HREF=\"" + link + "\">" + text
+ + "</A>";
+ break;
+
+ case INTERWIKI:
+ result = "<A CLASS=\"interwiki\" HREF=\"" + link + "\">" + text
+ + "</A>";
+ break;
+
+ case ATTACHMENT:
+ String attlink = getAttachmentURL(link);
+ result = "<a class=\"attachment\" href=\""
+ + attlink
+ + "\">"
+ + text
+ + "</a>"
+ + "<a href=\""
+ + getBaseURL()
+ + "PageInfo.jsp?page="
+ + encodedlink
+ + "\"><img src=\"images/attachment_small.png\" border=\"0\" /></a>";
+ break;
+
+ default:
+ result = "";
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * @param link
+ * @return
+ */
+ private String encodeName(String link) {
+ String newlink;
+
+ try {
+ if (encoding != null)
+ return java.net.URLEncoder.encode(link, encoding);
+ }
+
+ catch (UnsupportedEncodingException e) {
+ log.fatal("Internal error: Wrong encoding.", e);
+
+ }
+ return null;
+
+ }
+
+ /**
+ * @return
+ */
+ private String getBaseURL() {
+
+ return BASE_URL;
+ }
+
+ /**
+ * @param link
+ * @return
+ */
+ private String getAttachmentURL(String link) {
+
+ return BASE_URL + ATTACH_PATH + encodeName(link);
+ }
+
+ /**
+ * @param link
+ * @return
+ */
+ private String getEditURL(String link) {
+
+ return BASE_URL + EDIT_PATH + encodeName(link);
+ }
+
+ /**
+ * @param link
+ * @return
+ */
+ private String getViewURL(String link) {
+
+ return BASE_URL + VIEW_PATH + encodeName(link);
+ }
+
+ /**
+ * Image links are handled differently: 1. If the text is a WikiName of an
+ * existing page, it gets linked. 2. If the text is an external link, then
+ * it is inlined. 3. Otherwise it becomes an ALT text.
+ *
+ * @param reallink
+ * The link to the image.
+ * @param link
+ * Link text portion, may be a link to somewhere else.
+ * @param hasLinkText
+ * If true, then the defined link had a link text available. This
+ * means that the link text may be a link to a wiki page, or an
+ * external resource.
+ */
+
+ private String handleImageLink(String reallink, String link,
+ boolean hasLinkText) {
+ String possiblePage = cleanLink(link);
+ String matchedLink;
+ String res = "";
+
+ if (isExternalLink(link) && hasLinkText) {
+ res = makeLink(IMAGELINK, reallink, link);
+ } else if ((matchedLink = linkExists(possiblePage)) != null
+ && hasLinkText) {
+
+ res = makeLink(IMAGEWIKILINK, reallink, link);
+ } else {
+ res = makeLink(IMAGE, reallink, link);
+ }
+
+ return res;
+ }
+
+ /**
+ * Cleans a Wiki name.
+ * <P>[ This is a link ] -> ThisIsALink
+ *
+ * @param link
+ * Link to be cleared. Null is safe, and causes this to return
+ * null.
+ * @return A cleaned link.
+ *
+ * @since 2.0
+ */
+ public static String cleanLink(String link) {
+ StringBuffer clean = new StringBuffer();
+
+ if (link == null)
+ return null;
+
+ //
+ // Compress away all whitespace and capitalize
+ // all words in between.
+ //
+
+ StringTokenizer st = new StringTokenizer(link, " -");
+
+ while (st.hasMoreTokens()) {
+ StringBuffer component = new StringBuffer(st.nextToken());
+
+ component.setCharAt(0, Character.toUpperCase(component.charAt(0)));
+
+ //
+ // We must do this, because otherwise compiling on JDK 1.4 causes
+ // a downwards incompatibility to JDK 1.3.
+ //
+ clean.append(component.toString());
+ }
+
+ //
+ // Remove non-alphanumeric characters that should not
+ // be put inside WikiNames. Note that all valid
+ // Unicode letters are considered okay for WikiNames.
+ // It is the problem of the WikiPageProvider to take
+ // care of actually storing that information.
+ //
+
+ for (int i = 0; i < clean.length(); i++) {
+ if (!(Character.isLetterOrDigit(clean.charAt(i))
+ || clean.charAt(i) == '_' || clean.charAt(i) == '.')) {
+ clean.deleteCharAt(i);
+ --i; // We just shortened this buffer.
+ }
+ }
+
+ return clean.toString();
+ }
+
+ /**
+ * If outlink images are turned on, returns a link to the outward linking
+ * image.
+ */
+ private final String outlinkImage() {
+ if (m_useOutlinkImage) {
+ return "<img class=\"outlink\" src=\"" + getBaseURL()
+ + "images/out.png\" alt=\"\" />";
+ }
+
+ return "";
+ }
+
+ private int nextToken() throws IOException {
+ return m_in.read();
+ }
+ private void pushBack(int c) throws IOException {
+ if (c != -1) {
+ m_in.unread(c);
+ }
+ }
+ private String handleBackslash()
+ throws IOException
+{
+ int ch = nextToken();
+
+ if( ch == '\\' )
+ {
+ int ch2 = nextToken();
+
+ if( ch2 == '\\' )
+ {
+ return "<BR clear=\"all\" />";
+ }
+
+ pushBack( ch2 );
+
+ return "<BR />";
+ }
+
+ pushBack( ch );
+
+ return "\\";
+}
+
+ private String handleUnderscore()
+ throws IOException
+ {
+ int ch = nextToken();
+ String res = "_";
+
+ if( ch == '_' )
+ {
+ res = m_isbold ? "</B>" : "<B>";
+ m_isbold = !m_isbold;
+ }
+ else
+ {
+ pushBack( ch );
+ }
+
+ return res;
+ }
+
+ /**
+ * For example: italics.
+ */
+ private String handleApostrophe()
+ throws IOException
+ {
+ int ch = nextToken();
+ String res = "'";
+
+ if( ch == '\'' )
+ {
+ res = m_isitalic ? "</I>" : "<I>";
+ m_isitalic = !m_isitalic;
+ }
+ else
+ {
+ m_in.unread( ch );
+ }
+
+ return res;
+ }
+
+ private String handleOpenbrace()
+ throws IOException
+ {
+ int ch = nextToken();
+ String res = "{";
+
+ if( ch == '{' )
+ {
+ int ch2 = nextToken();
+
+ if( ch2 == '{' )
+ {
+ res = "<PRE>";
+ m_isPre = true;
+ }
+ else
+ {
+ pushBack( ch2 );
+
+ res = "<TT>";
+ m_isTypedText = true;
+ }
+ }
+ else
+ {
+ pushBack( ch );
+ }
+
+ return res;
+ }
+
+ /**
+ * Handles both }} and }}}
+ */
+ private String handleClosebrace()
+ throws IOException
+ {
+ String res = "}";
+
+ int ch2 = nextToken();
+
+ if( ch2 == '}' )
+ {
+ int ch3 = nextToken();
+
+ if( ch3 == '}' )
+ {
+ if( m_isPre )
+ {
+ m_isPre = false;
+ res = "</PRE>";
+ }
+ else
+ {
+ res = "}}}";
+ }
+ }
+ else
+ {
+ pushBack( ch3 );
+
+ if( !m_isPre )
+ {
+ res = "</TT>";
+ m_isTypedText = false;
+ }
+ else
+ {
+ pushBack( ch2 );
+ }
+ }
+ }
+ else
+ {
+ pushBack( ch2 );
+ }
+
+ return res;
+ }
+
+ private String handleDash()
+ throws IOException
+ {
+ int ch = nextToken();
+
+ if( ch == '-' )
+ {
+ int ch2 = nextToken();
+
+ if( ch2 == '-' )
+ {
+ int ch3 = nextToken();
+
+ if( ch3 == '-' )
+ {
+ // Empty away all the rest of the dashes.
+ // Do not forget to return the first non-match back.
+ while( (ch = nextToken()) == '-' );
+
+ pushBack(ch);
+ return "<HR />";
+ }
+
+ pushBack( ch3 );
+ }
+ pushBack( ch2 );
+ }
+
+ pushBack( ch );
+
+ return "-";
+ }
+
+ private String handleHeading()
+ throws IOException
+ {
+ StringBuffer buf = new StringBuffer();
+
+ int ch = nextToken();
+
+ if( ch == '!' )
+ {
+ int ch2 = nextToken();
+
+ if( ch2 == '!' )
+ {
+ buf.append("<H2>");
+ m_closeTag = "</H2>";
+ }
+ else
+ {
+ buf.append( "<H3>" );
+ m_closeTag = "</H3>";
+ pushBack( ch2 );
+ }
+ }
+ else
+ {
+ buf.append( "<H4>" );
+ m_closeTag = "</H4>";
+ pushBack( ch );
+ }
+
+ return buf.toString();
+ }
+ private String handleUnorderedList()
+ throws IOException
+ {
+ StringBuffer buf = new StringBuffer();
+
+ if( m_listlevel > 0 )
+ {
+ buf.append("</LI>\n");
+ }
+
+ int numBullets = countChars( m_in, '*' ) + 1;
+
+ if( numBullets > m_listlevel )
+ {
+ for( ; m_listlevel < numBullets; m_listlevel++ )
+ buf.append("<UL>\n");
+ }
+ else if( numBullets < m_listlevel )
+ {
+ for( ; m_listlevel > numBullets; m_listlevel-- )
+ buf.append("</UL>\n");
+ }
+
+ buf.append("<LI>");
+
+ return buf.toString();
+ }
+
+ private String handleOrderedList()
+ throws IOException
+ {
+ StringBuffer buf = new StringBuffer();
+
+ if( m_numlistlevel > 0 )
+ {
+ buf.append("</LI>\n");
+ }
+
+ int numBullets = countChars( m_in, '#' ) + 1;
+
+ if( numBullets > m_numlistlevel )
+ {
+ for( ; m_numlistlevel < numBullets; m_numlistlevel++ )
+ buf.append("<OL>\n");
+ }
+ else if( numBullets < m_numlistlevel )
+ {
+ for( ; m_numlistlevel > numBullets; m_numlistlevel-- )
+ buf.append("</OL>\n");
+ }
+
+ buf.append("<LI>");
+
+ return buf.toString();
+
+ }
+ private int countChars( PushbackReader in, char c )
+ throws IOException
+ {
+ int count = 0;
+ int ch;
+
+ while( (ch = in.read()) != -1 )
+ {
+ if( (char)ch == c )
+ {
+ count++;
+ }
+ else
+ {
+ in.unread( ch );
+ break;
+ }
+ }
+
+ return count;
+ }
+
+ private String handleDefinitionList()
+ throws IOException
+ {
+ if( !m_isdefinition )
+ {
+ m_isdefinition = true;
+
+ m_closeTag = "</DD>\n</DL>";
+
+ return "<DL>\n<DT>";
+ }
+
+ return ";";
+ }
+
+ private String handleOpenbracket()
+ throws IOException
+ {
+ StringBuffer sb = new StringBuffer();
+ int ch;
+ boolean isPlugin = false;
+
+ while( (ch = nextToken()) == '[' )
+ {
+ sb.append( (char)ch );
+ }
+
+ if( ch == '{' )
+ {
+ isPlugin = true;
+ }
+
+ pushBack( ch );
+
+ if( sb.length() > 0 )
+ {
+ return sb.toString();
+ }
+
+ //
+ // Find end of hyperlink
+ //
+
+ ch = nextToken();
+
+ while( ch != -1 )
+ {
+ if( ch == ']' && (!isPlugin || sb.charAt( sb.length()-1 ) == '}' ) )
+ {
+ break;
+ }
+
+ sb.append( (char) ch );
+
+ ch = nextToken();
+ }
+
+ if( ch == -1 )
+ {
+ log.info("Warning: unterminated link detected!");
+ return sb.toString();
+ }
+
+ return handleHyperlinks( sb.toString() );
+ }
+
+ private String handleBar( boolean newLine )
+ throws IOException
+ {
+ StringBuffer sb = new StringBuffer();
+
+ if( !m_istable && !newLine )
+ {
+ return "|";
+ }
+
+ if( newLine )
+ {
+ if( !m_istable )
+ {
+ sb.append("<TABLE CLASS=\"wikitable\" BORDER=\"1\">\n");
+ m_istable = true;
+ }
+
+ sb.append("<TR>");
+ m_closeTag = "</TD></TR>";
+ }
+
+ int ch = nextToken();
+
+ if( ch == '|' )
+ {
+ if( !newLine )
+ {
+ sb.append("</TH>");
+ }
+ sb.append("<TH>");
+ m_closeTag = "</TH></TR>";
+ }
+ else
+ {
+ if( !newLine )
+ {
+ sb.append("</TD>");
+ }
+ sb.append("<TD>");
+ pushBack( ch );
+ }
+
+ return sb.toString();
+ }
+
+ /**
+ * Generic escape of next character or entity.
+ */
+ private String handleTilde()
+ throws IOException
+ {
+ int ch = nextToken();
+
+ if( ch == '|' )
+ return "|";
+
+ if( Character.isUpperCase( (char) ch ) )
+ {
+ return String.valueOf( (char)ch );
+ }
+
+ // No escape.
+ pushBack( ch );
+
+ return "~";
+ }
+
+ /**
+ * Gobbles up all hyperlinks that are encased in square brackets.
+ * [{$varname}] not supported, as well as plugin links, and attachments as
+ * well
+ */
+ private String handleHyperlinks(String link) {
+ StringBuffer sb = new StringBuffer();
+ String reallink;
+ int cutpoint;
+ link = replaceEntities(link);
+
+ if ((cutpoint = link.indexOf('|')) != -1) {
+ reallink = link.substring(cutpoint + 1).trim();
+ link = link.substring(0, cutpoint);
+ } else {
+ reallink = link.trim();//get rid of white spaces
+ }
+
+ int interwikipoint = -1;//not quite supported either
+ if (isExternalLink(reallink)) {
+ // It's an external link, out of this Wiki
+
+ //callMutatorChain( m_externalLinkMutatorChain, reallink );
+
+ if (isImageLink(reallink)) {
+ sb.append(handleImageLink(reallink, link, (cutpoint != -1)));
+ } else {
+ sb.append(makeLink(EXTERNAL, reallink, link));
+ sb.append(outlinkImage());
+ }
+ } else if ((interwikipoint = reallink.indexOf(":")) != -1) {
+ // It's an interwiki link
+ // InterWiki links also get added to external link chain
+ // after the links have been resolved.
+
+ // FIXME: There is an interesting issue here: We probably should
+ // URLEncode the wikiPage, but we can't since some of the
+ // Wikis use slashes (/), which won't survive URLEncoding.
+ // Besides, we don't know which character set the other Wiki
+ // is using, so you'll have to write the entire name as it appears
+ // in the URL. Bugger.
+
+ String extWiki = reallink.substring(0, interwikipoint);
+ String wikiPage = reallink.substring(interwikipoint + 1);
+
+ String urlReference = getInterWikiURL(extWiki);
+
+ if (urlReference != null) {
+ urlReference = replaceString(urlReference, "%s", wikiPage);
+ //callMutatorChain( m_externalLinkMutatorChain, urlReference );
+
+ sb.append(makeLink(INTERWIKI, urlReference, link));
+
+ if (isExternalLink(urlReference)) {
+ sb.append(outlinkImage());
+ }
+ } else {
+ sb
+ .append(link
+ + " <FONT COLOR=\"#FF0000\">(No InterWiki reference defined in properties for Wiki called '"
+ + extWiki + "'!)</FONT>");
+ }
+ } else if (reallink.startsWith("#")) {
+ // It defines a local footnote
+ sb.append(makeLink(LOCAL, reallink, link));
+ } else if (isNumber(reallink)) {
+ // It defines a reference to a local footnote
+ sb.append(makeLink(LOCALREF, reallink, link));
+ } else {
+ // It's an internal Wiki link
+ reallink = cleanLink(reallink);
+
+ // callMutatorChain( m_localLinkMutatorChain, reallink );
+
+ String matchedLink;
+ if ((matchedLink = linkExists(reallink)) != null) {
+ sb.append(makeLink(READ, matchedLink, link));
+ } else {
+ sb.append(makeLink(EDIT, reallink, link));
+ }
+ }
+ // }
+
+ return sb.toString();
+ }
+
+ /**
+ * @param extWiki
+ * @return
+ */
+ private String getInterWikiURL(String extWiki) {
+ // TODO Auto-generated method stub
+ return "inter";
+ }
+
+ /**
+ * Returns true, if the argument contains a number, otherwise false. In a
+ * quick test this is roughly the same speed as Integer.parseInt() if the
+ * argument is a number, and roughly ten times the speed, if the argument is
+ * NOT a number.
+ */
+
+ private boolean isNumber(String s) {
+ if (s == null)
+ return false;
+
+ if (s.length() > 1 && s.charAt(0) == '-')
+ s = s.substring(1);
+
+ for (int i = 0; i < s.length(); i++) {
+ if (!Character.isDigit(s.charAt(i)))
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Replaces the relevant entities inside the String. All >, < and
+ * " are replaced by their respective names.
+ *
+ * @since 1.6.1
+ */
+ public static String replaceEntities(String src) {
+ src = replaceString(src, "<", "<");
+ src = replaceString(src, ">", ">");
+ src = replaceString(src, "\"", """);
+
+ return src;
+ }
+
+ /**
+ * Replaces a string with an other string.
+ *
+ * @param orig
+ * Original string. Null is safe.
+ * @param src
+ * The string to find.
+ * @param dest
+ * The string to replace <I>src </I> with.
+ */
+
+ public static String replaceString(String orig, String src, String dest) {
+ if (orig == null)
+ return null;
+
+ StringBuffer res = new StringBuffer();
+ int start, end = 0, last = 0;
+
+ while ((start = orig.indexOf(src, end)) != -1) {
+ res.append(orig.substring(last, start));
+ res.append(dest);
+ end = start + src.length();
+ last = start + src.length();
+ }
+
+ res.append(orig.substring(end));
+
+ return res.toString();
+ }
+
+ /**
+ * Replaces a part of a string with a new String.
+ *
+ * @param start
+ * Where in the original string the replacing should start.
+ * @param end
+ * Where the replacing should end.
+ * @param orig
+ * Original string. Null is safe.
+ * @param text
+ * The new text to insert into the string.
+ */
+ public static String replaceString(String orig, int start, int end,
+ String text) {
+ if (orig == null)
+ return null;
+
+ StringBuffer buf = new StringBuffer(orig);
+
+ buf.replace(start, end, text);
+
+ return buf.toString();
+ }
+
+ public void close() {
+ }
+
+ public int read(char[] buf, int off, int len) throws IOException {
+ return m_data.read(buf, off, len);
+ }
+
+ public int read()
+ throws IOException
+{
+ int val = m_data.read();
+
+ if( val == -1 )
+ {
+ transform();
+ val = m_data.read();
+
+ if( val == -1 )
+ {
+ m_data = new StringReader( closeAll() );
+
+ val = m_data.read();
+ }
+ }
+
+ return val;
+}
+ /**
+ * Closes all annoying lists and things that the user might've
+ * left open.
+ */
+ private String closeAll()
+ {
+ StringBuffer buf = new StringBuffer();
+
+ if( m_isbold )
+ {
+ buf.append("</B>");
+ m_isbold = false;
+ }
+
+ if( m_isitalic )
+ {
+ buf.append("</I>");
+ m_isitalic = false;
+ }
+
+ if( m_isTypedText )
+ {
+ buf.append("</TT>");
+ m_isTypedText = false;
+ }
+
+ for( ; m_listlevel > 0; m_listlevel-- )
+ {
+ buf.append( "</UL>\n" );
+ }
+
+ for( ; m_numlistlevel > 0; m_numlistlevel-- )
+ {
+ buf.append( "</OL>\n" );
+ }
+
+ if( m_isPre )
+ {
+ buf.append("</PRE>\n");
+ m_isPre = false;
+ }
+
+ if( m_istable )
+ {
+ buf.append( "</TABLE>" );
+ m_istable = false;
+ }
+
+ return buf.toString();
+ }
+
+ private void transform() throws IOException {
+ StringBuffer buf = new StringBuffer();
+ StringBuffer word = null;
+ int previousCh = -2;
+ int start = 0;
+
+ boolean quitReading = false;
+ boolean newLine = true; // FIXME: not true if reading starts in middle
+ // of buffer
+
+ while (!quitReading) {
+ int ch = nextToken();
+ String s = null;
+
+ //
+ // Check if we're actually ending the preformatted mode.
+ // We still must do an entity transformation here.
+ //
+ if (m_isPre) {
+ if (ch == '}') {
+ buf.append(handleClosebrace());
+ } else if (ch == '<') {
+ buf.append("<");
+ } else if (ch == '>') {
+ buf.append(">");
+ } else if (ch == -1) {
+ quitReading = true;
+ } else {
+ buf.append((char) ch);
+ }
+
+ continue;
+ }
+ //
+ // CamelCase detection, a non-trivial endeavour.
+ // We keep track of all white-space separated entities, which we
+ // hereby refer to as "words". We then check for an existence
+ // of a CamelCase format text string inside the "word", and
+ // if one exists, we replace it with a proper link.
+ //
+
+ if( m_camelCaseLinks )
+ {
+ // Quick parse of start of a word boundary.
+
+ if( word == null &&
+ (Character.isWhitespace( (char)previousCh ) ||
+ WORD_SEPARATORS.indexOf( (char)previousCh ) != -1 ||
+ newLine ) &&
+ !Character.isWhitespace( (char) ch ) )
+ {
+ word = new StringBuffer();
+ }
+
+ // Are we currently tracking a word?
+ if( word != null )
+ {
+ //
+ // Check for the end of the word.
+ //
+
+ if( Character.isWhitespace( (char)ch ) ||
+ ch == -1 ||
+ WORD_SEPARATORS.indexOf( (char) ch ) != -1 )
+ {
+ String potentialLink = word.toString();
+
+ String camelCase = checkForCamelCaseLink(potentialLink);
+
+ if( camelCase != null )
+ {
+ // System.out.println("Buffer is "+buf);
+
+ // System.out.println(" Replacing "+camelCase+" with
+ // proper link.");
+ start = buf.toString().lastIndexOf( camelCase );
+ buf.replace(start,
+ start+camelCase.length(),
+ makeCamelCaseLink(camelCase) );
+
+ // System.out.println(" Resulting with "+buf);
+ }
+
+ // We've ended a word boundary, so time to reset.
+ word = null;
+ }
+ else
+ {
+ // This should only be appending letters and digits.
+ word.append( (char)ch );
+ } // if end of word
+ } // if word's not null
+
+ // Always set the previous character to test for word starts.
+ previousCh = ch;
+
+ } // if m_camelCaseLinks
+
+ //
+ // Check if any lists need closing down.
+ //
+
+ if( newLine && ch != '*' && ch != ' ' && m_listlevel > 0 )
+ {
+ buf.append("</LI>\n");
+ for( ; m_listlevel > 0; m_listlevel-- )
+ {
+ buf.append("</UL>\n");
+ }
+ }
+
+ if( newLine && ch != '#' && ch != ' ' && m_numlistlevel > 0 )
+ {
+ buf.append("</LI>\n");
+ for( ; m_numlistlevel > 0; m_numlistlevel-- )
+ {
+ buf.append("</OL>\n");
+ }
+ }
+
+ if( newLine && ch != '|' && m_istable )
+ {
+ buf.append("</TABLE>\n");
+ m_istable = false;
+ m_closeTag = null;
+ }
+
+ //
+ // Now, check the incoming token.
+ //
+ switch( ch )
+ {
+ case '\r':
+ // DOS linefeeds we forget
+ s = null;
+ break;
+
+ case '\n':
+ //
+ // Close things like headings, etc.
+ //
+ if( m_closeTag != null )
+ {
+ buf.append( m_closeTag );
+ m_closeTag = null;
+ }
+
+ m_isdefinition = false;
+
+ if( newLine )
+ {
+ // Paragraph change.
+
+ buf.append("<P>\n");
+ }
+ else
+ {
+ buf.append("\n");
+ newLine = true;
+ }
+
+ break;
+
+ case '\\':
+ s = handleBackslash();
+ break;
+
+ case '_':
+ s = handleUnderscore();
+ break;
+
+ case '\'':
+ s = handleApostrophe();
+ break;
+
+ case '{':
+ s = handleOpenbrace();
+ break;
+
+ case '}':
+ s = handleClosebrace();
+ break;
+
+ case '-':
+ s = handleDash();
+ break;
+
+ case '!':
+ if( newLine )
+ {
+ s = handleHeading();
+ }
+ else
+ {
+ s = "!";
+ }
+ break;
+
+ case ';':
+ if( newLine )
+ {
+ s = handleDefinitionList();
+ }
+ else
+ {
+ s = ";";
+ }
+ break;
+
+ case ':':
+ if( m_isdefinition )
+ {
+ s = "</DT><DD>";
+ m_isdefinition = false;
+ }
+ else
+ {
+ s = ":";
+ }
+ break;
+
+ case '[':
+ s = handleOpenbracket();
+ break;
+
+ case '*':
+ if( newLine )
+ {
+ s = handleUnorderedList();
+ }
+ else
+ {
+ s = "*";
+ }
+ break;
+
+ case '#':
+ if( newLine )
+ {
+ s = handleOrderedList();
+ }
+ else
+ {
+ s = "#";
+ }
+ break;
+
+ case '|':
+ s = handleBar( newLine );
+ break;
+
+ case '<':
+ s = m_allowHTML ? "<" : "<";
+ break;
+
+ case '>':
+ s = m_allowHTML ? ">" : ">";
+ break;
+
+ case '\"':
+ s = m_allowHTML ? "\"" : """;
+ break;
+
+ /*
+ * case '&': s = "&"; break;
+ */
+ case '~':
+ s = handleTilde();
+ break;
+
+ case -1:
+ if( m_closeTag != null )
+ {
+ buf.append( m_closeTag );
+ m_closeTag = null;
+ }
+ quitReading = true;
+ break;
+
+ default:
+ buf.append( (char)ch );
+ newLine = false;
+ break;
+ }
+
+ if( s != null )
+ {
+ buf.append( s );
+ newLine = false;
+ }
+
+ }
+ m_data = new StringReader( buf.toString() );
+ }
+}
\ No newline at end of file
|
|
From: <jbo...@li...> - 2005-08-11 03:50:42
|
Author: dam...@jb... Date: 2005-08-10 23:49:18 -0400 (Wed, 10 Aug 2005) New Revision: 816 Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/mysql-connector-java-3.0.16-ga-bin.jar Log: Added the mysql-connector jar. Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/mysql-connector-java-3.0.16-ga-bin.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/mysql-connector-java-3.0.16-ga-bin.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |
550 messages has been excluded from this view by a project administrator.
