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-10 23:09:16
|
Author: dam...@jb... Date: 2005-08-10 19:07:59 -0400 (Wed, 10 Aug 2005) New Revision: 815 Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp Log: Changed the text in "Your Trail" to be TODO. 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-10 21:46:58 UTC (rev 814) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-10 23:07:59 UTC (rev 815) @@ -26,7 +26,7 @@ <hr /> -<div class="wikiTrail">Your trail: <i>TO BE DONE</i></div> +<div class="wikiTrail">Your trail: <i>TODO</i></div> <hr /> |
From: <jbo...@li...> - 2005-08-10 21:48:21
|
Author: szimano Date: 2005-08-10 17:46:58 -0400 (Wed, 10 Aug 2005) New Revision: 814 Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp Log: now it is ok. 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-10 21:34:48 UTC (rev 813) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-10 21:46:58 UTC (rev 814) @@ -22,14 +22,8 @@ private String defaultPage = "Main"; - private String page = "Wiki.jsp"; - - private String wikiPage = defaultPage; - private WikiEngine wikiEngine; - private WikiContext wikiContext; - public void init() { wikiEngine = new WikiEngine(); } @@ -73,15 +67,16 @@ } public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) { - if ((rReq.getParameter("action") != null) - && (rReq.getParameter("action").equals("Edit"))) { - page = "Edit.jsp"; - } else { - page = "Wiki.jsp"; + + WikiContext wikiContext = new WikiContext(rReq.getUser(), new WikiType()); + + if (rReq.getParameter("action") != null) { + rResp.setRenderParameter("action", rReq.getParameter("action")); } if (rReq.getParameter("page") != null) { - wikiPage = rReq.getParameter("page"); + rResp.setRenderParameter("page", rReq.getParameter("page")); + } if (rReq.getParameter("editAction") != null) { @@ -125,9 +120,24 @@ public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes) throws PortletException, java.io.IOException { + + String page = "Wiki.jsp"; + + String wikiPage = defaultPage; + + if ((rReq.getParameter("action") != null) + && (rReq.getParameter("action").equals("Edit"))) { + page = "Edit.jsp"; + } else { + page = "Wiki.jsp"; + } + + if (rReq.getParameter("page") != null) { + wikiPage = rReq.getParameter("page"); + } + + WikiContext wikiContext = new WikiContext(rReq.getUser(), new WikiType()); - wikiContext = new WikiContext(rReq.getUser(), new WikiType()); - PortletURL wikiURL = rRes.createActionURL(); rReq.setAttribute("actionURL", wikiURL.toString()); 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-10 21:34:48 UTC (rev 813) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-10 21:46:58 UTC (rev 814) @@ -41,7 +41,7 @@ <tr> <td class="wikiFooter"> <hr /> -<a href="<%=actionURL%>&action=Edit">Edit this page</a> <a href="<%=actionURL%>">More info...</a> <a href="<%=actionURL%>">Attach file...</a> +<a href="<%=actionURL%>&action=Edit&page=<%=wikiPage%>">Edit this page</a> <a href="<%=actionURL%>">More info...</a> <a href="<%=actionURL%>">Attach file...</a> </td> </tr> </table> |
From: <jbo...@li...> - 2005-08-10 21:36:05
|
Author: dam...@jb... Date: 2005-08-10 17:34:48 -0400 (Wed, 10 Aug 2005) New Revision: 813 Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java Log: renamed wiki to wikiEngine. 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-10 20:50:52 UTC (rev 812) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-10 21:34:48 UTC (rev 813) @@ -26,12 +26,12 @@ private String wikiPage = defaultPage; - private WikiEngine wiki; + private WikiEngine wikiEngine; private WikiContext wikiContext; public void init() { - wiki = new WikiEngine(); + wikiEngine = new WikiEngine(); } public String translateLinks(String content, String actionURL) { @@ -96,7 +96,7 @@ System.out.println("SAVING PAGE"); // save the page - WikiPage edPage = wiki.getByName(rReq + WikiPage edPage = wikiEngine.getByName(rReq .getParameter("editedPage"), wikiContext); if (edPage == null) { @@ -134,14 +134,14 @@ rReq.setAttribute("wikiName", "Szimano Wiki"); - WikiPage pageToShow = wiki.getByName(wikiPage, wikiContext); + WikiPage pageToShow = wikiEngine.getByName(wikiPage, wikiContext); if (pageToShow == null) { // TODO Make this show, that page isn't there yet wikiPage = defaultPage; - pageToShow = wiki.getByName(wikiPage, wikiContext); + pageToShow = wikiEngine.getByName(wikiPage, wikiContext); } rReq.setAttribute("wikiContent", (page == "Wiki.jsp") ? translateLinks( |
From: <jbo...@li...> - 2005-08-10 20:52:12
|
Author: szimano Date: 2005-08-10 16:50:52 -0400 (Wed, 10 Aug 2005) New Revision: 812 Modified: trunk/forge/portal-extensions/forge-wiki/maven.xml Log: props file Modified: trunk/forge/portal-extensions/forge-wiki/maven.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-10 20:12:17 UTC (rev 811) +++ trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-10 20:50:52 UTC (rev 812) @@ -5,14 +5,20 @@ --> <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> <goal name="build"> - <attainGoal name="copy-tld" /> + <attainGoal name="copy-tld" /> + <ant:copy todir="target/classes/org/jboss/wiki" flatten="true"> + <ant:fileset dir="src/java/org/jboss/wiki"> + <ant:filename name="*.properties" /> + </ant:fileset> + </ant:copy> + <attainGoal name="war" /> </goal> <goal name="deploy"> <ant:copy todir="${local.deploy.dir}" flatten="true"> <ant:fileset dir="."> - <ant:filename name="target/*.war" /> + <ant:filename name="target/*.war" /> </ant:fileset> </ant:copy> </goal> |
From: <jbo...@li...> - 2005-08-10 20:13:40
|
Author: szimano Date: 2005-08-10 16:12:17 -0400 (Wed, 10 Aug 2005) New Revision: 811 Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties Removed: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPagesHolder.java trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/test.jsp Log: ups... one file missing Deleted: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPagesHolder.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPagesHolder.java 2005-08-10 20:07:21 UTC (rev 810) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPagesHolder.java 2005-08-10 20:12:17 UTC (rev 811) @@ -1,52 +0,0 @@ - package org.jboss.wiki; - -/** - * <p></p> - * - * pages is HashMap<String, WikiPage> - * get easly to each page by its name. - * plus basic functions for pages handling - */ -public class WikiPagesHolder { - -/** - * <p>Represents ...</p> - * - * pages is HashMap<String, WikiPage> - * get easly to each page by its name. - * plus basic functions for pages handling - */ - public HashMap pages; - -/** - * <p></p> - * - */ - public WikiEngine wikiEngine; - -/** - * <p>Does ...</p> - * - * - * @param pageName - * @param user - * @return - */ - public WikiPage getPageByName(String pageName, Credentials user) { - // your code here - return null; - } - -/** - * <p>Does ...</p> - * - * - * @return - * @param pageName - */ - public String getHtmlText(String pageName) { - // your code here - return null; - } - - } Added: 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-10 20:07:21 UTC (rev 810) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties 2005-08-10 20:12:17 UTC (rev 811) @@ -0,0 +1,4 @@ +# FileDataSource configuration file + +# pathToMedia - points, where JSPWiki file structure is situated +pathToMedia = /usr/local/forge/wiki Deleted: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/test.jsp =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/test.jsp 2005-08-10 20:07:21 UTC (rev 810) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/test.jsp 2005-08-10 20:12:17 UTC (rev 811) @@ -1,31 +0,0 @@ -<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> -<%@ taglib uri="/WEB-INF/tld/portlet.tld" prefix="n" %> -<%@ taglib uri="/WEB-INF/tld/forge.tld" prefix="forge" %> -<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> -<%@ page isELIgnored ="false" %> -<portlet:defineObjects/> - -<h2>Who's a contributor now?</h2> - - -<h2>Contribute! Sign a Contributors Agreement now!</h2> - -<p>Please fill in all fields.</p> - -<% - String actionURL = (String)request.getAttribute("actionURL"); -%> - -<form method="post" action="<%=actionURL%>"> -<table class="infotable" cellspacing="5" style="font-size:90%; padding:2px; margin: 2px;"> - <tr> - <td width="140">Name/ organization:</td> - <td width="140"><input type="text" name="name" value="${n:out("name")}" /></td> - </tr> - - <tr> - <td></td> - <td><input type="submit" value="Sign" /></td> - </tr> -</table> -</form> |
From: <jbo...@li...> - 2005-08-10 20:08:53
|
Author: adamw Date: 2005-08-10 16:07:21 -0400 (Wed, 10 Aug 2005) New Revision: 810 Modified: trunk/forge/portal-extensions/blojsom/project.xml trunk/forge/portal-extensions/jboss-forums/project.xml trunk/forge/portal-extensions/jspwiki/project.xml Log: Build fix Modified: trunk/forge/portal-extensions/blojsom/project.xml =================================================================== --- trunk/forge/portal-extensions/blojsom/project.xml 2005-08-10 19:53:46 UTC (rev 809) +++ trunk/forge/portal-extensions/blojsom/project.xml 2005-08-10 20:07:21 UTC (rev 810) @@ -6,7 +6,6 @@ --> <project> <pomVersion>3</pomVersion> - <extend>../common.xml</extend> <id>blojsom</id> <name>Blojsom</name> <currentVersion>1.0</currentVersion> Modified: trunk/forge/portal-extensions/jboss-forums/project.xml =================================================================== --- trunk/forge/portal-extensions/jboss-forums/project.xml 2005-08-10 19:53:46 UTC (rev 809) +++ trunk/forge/portal-extensions/jboss-forums/project.xml 2005-08-10 20:07:21 UTC (rev 810) @@ -6,7 +6,6 @@ --> <project> <pomVersion>3</pomVersion> - <extend>../common.xml</extend> <id>jbossforums</id> <name>JBoss Forums</name> <currentVersion>1.0</currentVersion> Modified: trunk/forge/portal-extensions/jspwiki/project.xml =================================================================== --- trunk/forge/portal-extensions/jspwiki/project.xml 2005-08-10 19:53:46 UTC (rev 809) +++ trunk/forge/portal-extensions/jspwiki/project.xml 2005-08-10 20:07:21 UTC (rev 810) @@ -6,7 +6,6 @@ --> <project> <pomVersion>3</pomVersion> - <extend>../common.xml</extend> <id>jspwiki</id> <name>JSPWiki</name> <currentVersion>1.0</currentVersion> |
Author: szimano Date: 2005-08-10 15:53:46 -0400 (Wed, 10 Aug 2005) New Revision: 809 Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.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/WikiPortlet.java trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp trunk/forge/portal-extensions/portal-default/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/default-portal.xml Log: wiki - browsable... publishing on forge.sicore Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java 2005-08-10 19:17:27 UTC (rev 808) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java 2005-08-10 19:53:46 UTC (rev 809) @@ -18,4 +18,8 @@ public void setName(String name) { this.name = name; } + + public String toString() { + return name; + } } Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java 2005-08-10 19:17:27 UTC (rev 808) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java 2005-08-10 19:53:46 UTC (rev 809) @@ -20,7 +20,7 @@ * </p> * */ - private final String propFileName = "/home/tomek/java/sandbox/new_svn/trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties"; + private final String propFileName = "filedatasource.properties";//"/home/tomek/java/sandbox/new_svn/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties"; private String pathToMedia; @@ -32,7 +32,7 @@ fileDSProps = new Properties(); try { - fileDSProps.load(new FileInputStream(new File(propFileName))); + fileDSProps.load(FileDataSource.class.getResourceAsStream(propFileName)); } catch (IOException ioe) { System.err.println("Can't load the file " + propFileName + "\n" + ioe); 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-10 19:17:27 UTC (rev 808) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java 2005-08-10 19:53:46 UTC (rev 809) @@ -24,4 +24,23 @@ * */ public WikiType wikiType; + + public WikiContext(User user, WikiType requestedType) { + this.user = user; + this.requestedType = requestedType; + } + + public WikiType getRequestedType() { + return requestedType; + } + + + public User getUser() { + return user; + } + + public WikiType getWikiType() { + return wikiType; + } + } 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-10 19:17:27 UTC (rev 808) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-10 19:53:46 UTC (rev 809) @@ -1,5 +1,6 @@ package org.jboss.wiki; +import java.util.HashMap; import java.util.Map; /** @@ -30,23 +31,14 @@ * */ private Map wikiTypePlugins; + /** * <p></p> * */ - private WikiPagesHolder pages; -/** - * <p></p> - * - */ - public WikiPage wikiPage; -/** - * <p></p> - * - * - * @poseidon-type WikiPage - */ - public java.util.Collection wikiPage_1 = new java.util.TreeSet(); + private HashMap<String, WikiPage> pages; + + private MediaDataSource mediaDataSource; /** * <p>Does ...</p> @@ -96,9 +88,22 @@ * @return * @param wikiContext */ - public WikiPage getByName(String pageName, WikiContext wikiContext) { - // your code here - return null; + public WikiPage getByName(String pageName, WikiContext wikiContext) { + + // TODO: make user authentication with wikiContext + + WikiPage ret = null; + + if (pages.containsKey(pageName)) { + ret = pages.get(pageName); + } + else { + ret = mediaDataSource.getPage(pageName); + + pages.put(pageName, ret); + } + + return ret; } /** @@ -202,5 +207,9 @@ * <p></p> * */ - public WikiPortlet wikiPortlet; + public WikiEngine() { + mediaDataSource = new FileDataSource(); + pages = new HashMap<String, WikiPage>(); + + } } 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-10 19:17:27 UTC (rev 808) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java 2005-08-10 19:53:46 UTC (rev 809) @@ -60,15 +60,11 @@ * */ private MediaDataSource mediaDataSource; + /** * <p></p> * */ - public WikiPagesHolder wikiPagesHolder; -/** - * <p></p> - * - */ public WikiEngine wikiEngine; /** * <p></p> @@ -210,7 +206,7 @@ public void showPage() { System.out.println("Page name: "+getName()); - System.out.println("Page author: "+getLastAuthor().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()); 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-10 19:17:27 UTC (rev 808) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-10 19:53:46 UTC (rev 809) @@ -6,85 +6,165 @@ * See terms of license at gnu.org. * * * *****************************************/ - - package org.jboss.wiki; - - import javax.portlet.*; - import org.jboss.portlet.*; - import java.util.Enumeration; - - public class WikiPortlet extends JBossPortlet { - - final static String jspPath = "/WEB-INF/jsp/"; - - private String page = "Wiki.jsp"; - - public void init() - { +package org.jboss.wiki; + +import java.util.Date; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.portlet.*; +import org.jboss.portlet.*; + +public class WikiPortlet extends JBossPortlet { + + final static String jspPath = "/WEB-INF/jsp/"; + + private String defaultPage = "Main"; + + private String page = "Wiki.jsp"; + + private String wikiPage = defaultPage; + + private WikiEngine wiki; + + private WikiContext wikiContext; + + public void init() { + wiki = new WikiEngine(); } - - public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) { - Enumeration en = rReq.getParameterNames(); - - System.out.println("Parametry(action):"); - - if(en.hasMoreElements()) { - while (en.hasMoreElements()) { - String elem = (String)en.nextElement(); - System.out.println(elem+" "+rReq.getParameter(elem)); - } + + 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>"); } - else { - System.out.println("BRAK PARAMETROW!!!"); + + 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>"); } - - if ((rReq.getParameter("action") != null)&&(rReq.getParameter("action").equals("Edit"))) { + + translatedContent = translatedContent.replace("\n", "<BR>\n"); + + return translatedContent; + } + + public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) { + if ((rReq.getParameter("action") != null) + && (rReq.getParameter("action").equals("Edit"))) { page = "Edit.jsp"; - } - else { + } else { page = "Wiki.jsp"; } + + if (rReq.getParameter("page") != null) { + wikiPage = rReq.getParameter("page"); + } + + if (rReq.getParameter("editAction") != null) { + System.out.println("EDITING PAGE"); + + // saving, previewing or canceling + + if (rReq.getParameter("editAction").equals("Save")) { + Credentials credentials = new Credentials( + (rReq.getUser() != null) ? rReq.getUser().getUserName() + : "Unknown"); + System.out.println("SAVING PAGE"); + + // save the page + WikiPage edPage = wiki.getByName(rReq + .getParameter("editedPage"), wikiContext); + + if (edPage == null) { + edPage = new WikiPage(rReq.getParameter("editedPage"), + credentials, "", 0, new Date()); + } + + // set new content + edPage.setPageContent(rReq.getParameter("wikiContent")); + + // set author name for new version + edPage.setLastAuthor(credentials); + + // increase page version + edPage.setLastVersion(edPage.getLastVersion() + 1); + + // set new data + edPage.setEditDate(new Date()); + + // finnaly save the page + edPage.save(); + } + } + } - - public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes) throws PortletException, java.io.IOException { - //System.out.println("\n\nURL "+jr.getURL()+"\n\n"); - - //System.out.println(decodeUrl(jr.getURL())); - - PortletURL newAgreementURL = rRes.createActionURL(); - rReq.setAttribute("actionURL", newAgreementURL.toString()); - - rReq.setAttribute("wikiName", "Szimano Wiki"); - - Enumeration en = rReq.getParameterNames(); - - System.out.println("Parametry:"); - - if(en.hasMoreElements()) { - while (en.hasMoreElements()) { - String elem = (String)en.nextElement(); - System.out.println(elem+" "+rReq.getParameter(elem)); + public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes) + throws PortletException, java.io.IOException { + + wikiContext = new WikiContext(rReq.getUser(), new WikiType()); + + PortletURL wikiURL = rRes.createActionURL(); + + rReq.setAttribute("actionURL", wikiURL.toString()); + + rReq.setAttribute("wikiName", "Szimano Wiki"); + + WikiPage pageToShow = wiki.getByName(wikiPage, wikiContext); + + if (pageToShow == null) { + // TODO Make this show, that page isn't there yet + + wikiPage = defaultPage; + + pageToShow = wiki.getByName(wikiPage, wikiContext); } + + rReq.setAttribute("wikiContent", (page == "Wiki.jsp") ? translateLinks( + pageToShow.getContent(), wikiURL.toString()) : pageToShow + .getContent()); + + rReq.setAttribute("wikiPage", wikiPage); + + rReq.setAttribute("editDate", pageToShow.getEditDate()); + + rReq.setAttribute("author", pageToShow.getLastAuthor()); + + rRes.setTitle("Wiki"); + if (javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState()) + || javax.portlet.WindowState.MAXIMIZED.equals(rReq + .getWindowState())) { + rRes.setContentType("text/html"); + javax.portlet.PortletRequestDispatcher pRD = this + .getPortletContext().getRequestDispatcher(jspPath + page); + pRD.include(rReq, rRes); + return; + } + doDispatch(rReq, rRes); } - else { - System.out.println("BRAK PARAMETROW!!!"); - } - - - System.out.println("Page = "+rReq.getParameters().get("page", null)); - - - rRes.setTitle("Wiki"); - if(javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState()) || javax.portlet.WindowState.MAXIMIZED.equals(rReq.getWindowState())) - { - rRes.setContentType("text/html"); - javax.portlet.PortletRequestDispatcher pRD = this.getPortletContext().getRequestDispatcher(jspPath+page); - pRD.include(rReq, rRes); - return; - } - doDispatch(rReq, rRes); - } - - } \ No newline at end of file + +} \ No newline at end of file Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2005-08-10 19:17:27 UTC (rev 808) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2005-08-10 19:53:46 UTC (rev 809) @@ -9,77 +9,21 @@ <% String actionURL = (String)request.getAttribute("actionURL"); String wikiName = (String)request.getAttribute("wikiName"); + String wikiContent = (String)request.getAttribute("wikiContent"); + String wikiPage = (String)request.getAttribute("wikiPage"); %> -<h2><%=wikiName%>: Main</h2> +<h2><%=wikiName%>: <%=wikiPage%></h2> <hr /> <form method="post" action="<%=actionURL%>"> <textarea name="wikiContent" rows="40" cols="80" style="width:100%;"> -<H3>Welcome to JBoss Labs</H3> -<P> -<B>JBoss Labs</B> is: -<UL> -<LI> a Professional Open Source community where Professional Open Source programmers around the world come to collaborate and create software for everyone -</LI> -<LI> the culmination of the efforts of developers (listed below as well as of all contributors to JEMS) to bring about a set of processes and infrastructure that enable the communication of ideas between the open source developers and their community. -</LI> -</UL> -<P> -<B>The Place To Be Is Our Wiki</B>: -<UL> -<LI> the place where we create and document the processes for Professional Open Source development. + <%=wikiContent%> -</LI> -<LI> main goal of Wiki is to provide an easy environment for POS communities to provide access to the products of their ideas. -</LI> -</UL> -<P> -JBoss is helping to nurture communication in open source communities with its JEMS offering a commitment to Professional Open Source developers around the world . -<P> -<IMG CLASS="inline" SRC="http://labs.jboss.com/file-access/default/members/default/images/LabsLayers.png" ALT="http://labs.jboss.com/file-access/default/members/default/images/LabsLayers.png" /> -<P> -JBoss Labs consists of: -<P> -<UL> -<LI> A set of <A CLASS="wikipage" HREF="Wiki.jsp?page=Processes">processes</A> that enable Professional Open Source software development. - -</LI> -<LI> An infrastructure, called <A CLASS="wikipage" HREF="Wiki.jsp?page=WhatIsJBossForge">JBoss Forge</A>, on which these processes manifest. -</LI> -<LI> A <A CLASS="wikipage" HREF="Wiki.jsp?page=JBossCommitters">community of developers</A> around the world contributing constantly. -</LI> -<LI> A <A CLASS="wikipage" HREF="Wiki.jsp?page=Projects">set of projects</A> which utilize the processes and infrustructure of JBoss Labs. - -</LI> -<LI> A Professional Open Source standard by which we measure quality and service offerings. -</LI> -<LI> And finally, a pathway for top-notch open source projects to enter the JEMS sofware suite--a symbol of Professional Open Source excellence and quality. -</LI> -</UL> -<P> -JBoss Labs' infrastructure is being developed by a community of developers from around the world. -<P> -Our developers are:<BR /> -<UL> -<LI><U>Damon Sicore</U><A HREF="Edit.jsp?page=Damon">?</A><BR /> - -</LI> -<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Rali">Rali Genova</A><BR /> -</LI> -<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Tomek">Tomek Szymański</A><BR /> -</LI> -<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Adam">Adam Warski</A><BR /> -</LI> -</UL> -<BR /> -and others... -<P> -This infrastructure is hosting several open source projects, and by the time you read this, there should be a few more. The current projects hosted on forge can be found on the <A CLASS="wikipage" HREF="Wiki.jsp?page=Projects">projects page</A>. - </textarea> +<input type="hidden" name="editedPage" value="<%=wikiPage%>" /> <input type="submit" value="Save" name="editAction" /> <input type="submit" value="Preview" name="editAction" /> <input type="submit" value="Cancel" name="editAction" /> 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-10 19:17:27 UTC (rev 808) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-10 19:53:46 UTC (rev 809) @@ -9,79 +9,33 @@ <% String actionURL = (String)request.getAttribute("actionURL"); String wikiName = (String)request.getAttribute("wikiName"); + String wikiContent = (String)request.getAttribute("wikiContent"); + String wikiPage = (String)request.getAttribute("wikiPage"); + java.util.Date editDate = (java.util.Date)request.getAttribute("editDate"); + org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author"); %> -<h2><%=wikiName%>: Main</h2> +<h2><%=wikiName%>: <%=wikiPage%></h2> -<div class="wikiTrail">Your trail:</div> +<div style="text-align: right;"> +<form method="post" action="<%=actionURL%>"> +<input type="text" name="page" /> +<input type="submit" value="GO" /> +</form> +</div> + <hr /> +<div class="wikiTrail">Your trail: <i>TO BE DONE</i></div> + +<hr /> + <table> <tr> <td class="wikiContent"> -<H3>Welcome to JBoss Labs</H3> -<P> -<B>JBoss Labs</B> is: -<UL> -<LI> a Professional Open Source community where Professional Open Source programmers around the world come to collaborate and create software for everyone -</LI> -<LI> the culmination of the efforts of developers (listed below as well as of all contributors to JEMS) to bring about a set of processes and infrastructure that enable the communication of ideas between the open source developers and their community. -</LI> -</UL> -<P> -<B>The Place To Be Is Our Wiki</B>: -<UL> -<LI> the place where we create and document the processes for Professional Open Source development. - -</LI> -<LI> main goal of Wiki is to provide an easy environment for POS communities to provide access to the products of their ideas. -</LI> -</UL> -<P> -JBoss is helping to nurture communication in open source communities with its JEMS offering a commitment to Professional Open Source developers around the world . -<P> -<IMG CLASS="inline" SRC="http://labs.jboss.com/file-access/default/members/default/images/LabsLayers.png" ALT="http://labs.jboss.com/file-access/default/members/default/images/LabsLayers.png" /> -<P> -JBoss Labs consists of: -<P> -<UL> -<LI> A set of <A CLASS="wikipage" HREF="Wiki.jsp?page=Processes">processes</A> that enable Professional Open Source software development. - -</LI> -<LI> An infrastructure, called <A CLASS="wikipage" HREF="Wiki.jsp?page=WhatIsJBossForge">JBoss Forge</A>, on which these processes manifest. -</LI> -<LI> A <A CLASS="wikipage" HREF="Wiki.jsp?page=JBossCommitters">community of developers</A> around the world contributing constantly. -</LI> -<LI> A <A CLASS="wikipage" HREF="Wiki.jsp?page=Projects">set of projects</A> which utilize the processes and infrustructure of JBoss Labs. - -</LI> -<LI> A Professional Open Source standard by which we measure quality and service offerings. -</LI> -<LI> And finally, a pathway for top-notch open source projects to enter the JEMS sofware suite--a symbol of Professional Open Source excellence and quality. -</LI> -</UL> -<P> -JBoss Labs' infrastructure is being developed by a community of developers from around the world. -<P> -Our developers are:<BR /> -<UL> -<LI><U>Damon Sicore</U><A HREF="Edit.jsp?page=Damon">?</A><BR /> - -</LI> -<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Rali">Rali Genova</A><BR /> -</LI> -<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Tomek">Tomek Szymański</A><BR /> -</LI> -<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Adam">Adam Warski</A><BR /> -</LI> -</UL> -<BR /> -and others... -<P> -This infrastructure is hosting several open source projects, and by the time you read this, there should be a few more. The current projects hosted on forge can be found on the <A CLASS="wikipage" HREF="Wiki.jsp?page=Projects">projects page</A>. - - + <%=wikiContent%> + <td> </tr> <tr> @@ -91,4 +45,5 @@ </td> </tr> </table> - +<br /> +<div class="author">The page last changed on <%=editDate%> by <%=author%>. </div> Modified: trunk/forge/portal-extensions/portal-default/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/default-portal.xml =================================================================== --- trunk/forge/portal-extensions/portal-default/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/default-portal.xml 2005-08-10 19:17:27 UTC (rev 808) +++ trunk/forge/portal-extensions/portal-default/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/default-portal.xml 2005-08-10 19:53:46 UTC (rev 809) @@ -115,20 +115,20 @@ <height>2</height> <window-state>normal</window-state> </window> - <window> + <!--<window> <window-name>JSPWikiPortletWindow</window-name> <instance-ref>jspwikiportlet.JSPWikiPortlet.JSPWikiPortletInstance</instance-ref> <default>true</default> <region>center</region> <height>0</height> - </window> - <!--<window> + </window>--> + <window> <window-name>WikiPortletWindow</window-name> <instance-ref>wikiportlet.WikiPortlet.WikiPortletInstance</instance-ref> <default>true</default> <region>center</region> <height>0</height> - </window>--> + </window> </page> <page> |
From: <jbo...@li...> - 2005-08-10 19:18:48
|
Author: adamw Date: 2005-08-10 15:17:27 -0400 (Wed, 10 Aug 2005) New Revision: 808 Modified: trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/web.xml Log: web.xml fix Modified: trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/web.xml =================================================================== --- trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/web.xml 2005-08-10 19:07:45 UTC (rev 807) +++ trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/web.xml 2005-08-10 19:17:27 UTC (rev 808) @@ -3,11 +3,6 @@ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> <web-app> - <listener> - <listener-class>org.jboss.forge.listener.StartupListener</listener-class> - </listener> - - <filter> <filter-name>filesFromRepoFilter</filter-name> <filter-class>org.jboss.forge.common.FilesFromRepoFilter</filter-class> |
Author: adamw Date: 2005-08-10 15:07:45 -0400 (Wed, 10 Aug 2005) New Revision: 807 Removed: trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/forge/ Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/jboss-xb.jar Log: EJB3 RC1 in build Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java =================================================================== --- trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2005-08-10 18:38:02 UTC (rev 806) +++ trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2005-08-10 19:07:45 UTC (rev 807) @@ -128,7 +128,6 @@ public void create() throws Exception { } - // TODO @EJB private ForgeTimerLocal timer; @@ -160,7 +159,6 @@ timerInterval = DEFAULT_TIMER_INTERVAL; // And starting the timer. - //TODO timer.scheduleTimer(DEFAULT_TIMER_INTERVAL); } Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml =================================================================== --- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml 2005-08-10 18:38:02 UTC (rev 806) +++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml 2005-08-10 19:07:45 UTC (rev 807) @@ -27,7 +27,7 @@ being broken with multicast (even after disabling media sense) set the loopback attribute to true --> - <UDP mcast_addr="228.1.2.3" mcast_port="45551" ip_ttl="64" ip_mcast="true" + <UDP mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" mcast_port="45551" ip_ttl="64" ip_mcast="true" mcast_send_buf_size="150000" mcast_recv_buf_size="80000" ucast_send_buf_size="150000" ucast_recv_buf_size="80000" loopback="false"/> <PING timeout="2000" num_initial_members="3" up_thread="false" down_thread="false"/> Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml =================================================================== --- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml 2005-08-10 18:38:02 UTC (rev 806) +++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml 2005-08-10 19:07:45 UTC (rev 807) @@ -39,7 +39,7 @@ being broken with multicast (even after disabling media sense) set the loopback attribute to true --> - <UDP mcast_addr="228.1.2.3" mcast_port="43333" ip_ttl="2" ip_mcast="true" + <UDP mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" mcast_port="43333" ip_ttl="2" ip_mcast="true" mcast_send_buf_size="150000" mcast_recv_buf_size="80000" ucast_send_buf_size="150000" ucast_recv_buf_size="80000" loopback="false" /> <PING timeout="2000" num_initial_members="3" up_thread="false" down_thread="false" /> Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml =================================================================== --- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml 2005-08-10 18:38:02 UTC (rev 806) +++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml 2005-08-10 19:07:45 UTC (rev 807) @@ -7,38 +7,66 @@ <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/> <interceptor class="org.jboss.aspects.security.SecurityClientInterceptor" scope="PER_VM"/> <interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor" scope="PER_VM"/> - <interceptor class="org.jboss.aspects.remoting.IsLocalInterceptor" scope="PER_VM"/> + <interceptor class="org.jboss.ejb3.remoting.IsLocalInterceptor" scope="PER_VM"/> <interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/> - <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/> - <stack name="AsynchronousSessionBeanClientInterceptors"> - <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/> + <stack name="ServiceClientInterceptors"> + <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/> <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/> <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/> <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/> </stack> - <stack name="SessionBeanClientInterceptors"> - <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/> + <stack name="AsynchronousStatelessSessionClientInterceptors"> + <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/> <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/> <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/> <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/> </stack> - <stack name="ClusteredSessionBeanClientInterceptors"> - <interceptor-ref name="org.jboss.aspects.remoting.IsLocalInterceptor"/> + <stack name="AsynchronousStatefulSessionClientInterceptors"> + <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/> <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/> <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/> + <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/> + </stack> + + <stack name="StatelessSessionClientInterceptors"> + <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/> + <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/> + <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/> + <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/> + </stack> + + <stack name="StatefulSessionClientInterceptors"> + <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/> + <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/> + <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/> + <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/> + </stack> + + <stack name="ClusteredStatelessSessionClientInterceptors"> + <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/> + <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/> + <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/> <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/> <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/> </stack> + <stack name="ClusteredStatefulSessionClientInterceptors"> + <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/> + <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/> + <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/> + <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/> + <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/> + </stack> + <interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor" scope="PER_CLASS"/> <interceptor factory="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/> <interceptor factory="org.jboss.ejb3.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/> - <interceptor class="org.jboss.ejb3.security.RunAsSecurityInterceptor" scope="PER_VM"/> + <interceptor factory="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/> <interceptor class="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor" scope="PER_VM"/> <interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/> <interceptor class="org.jboss.ejb3.stateful.StatefulInstanceInterceptor" scope="PER_VM"/> @@ -63,7 +91,7 @@ <interceptor-ref name="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory"/> </bind> <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))"> - <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/> + <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/> </bind> <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))"> <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/> @@ -88,7 +116,7 @@ </annotation> </domain> - <domain name="Stateful Bean"> + <domain name="Base Stateful Bean"> <bind pointcut="execution(* *->*(..))"> <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/> <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/> @@ -97,7 +125,7 @@ <interceptor-ref name="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory"/> </bind> <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))"> - <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/> + <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/> </bind> <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))"> <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/> @@ -130,7 +158,9 @@ <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)"> @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000) </annotation> + </domain> + <domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true"> <!-- NON Clustered cache configuration --> <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)"> @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class) @@ -151,9 +181,17 @@ </annotation> </domain> + <domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true"> + <!-- NON Clustered cache configuration --> + <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)"> + @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class) + </annotation> + + </domain> + <domain name="Message Driven Bean"> <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))"> - <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/> + <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/> </bind> <bind pointcut="execution(* *->*(..))"> <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/> @@ -177,7 +215,7 @@ <interceptor-ref name="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory"/> </bind> <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))"> - <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptor"/> + <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/> </bind> <bind pointcut="execution(* *->@javax.persistence.FlushMode(..))"> <interceptor-ref name="org.jboss.ejb3.entity.BeforeTxFlushModeInterceptor"/> Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml =================================================================== --- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml 2005-08-10 18:38:02 UTC (rev 806) +++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml 2005-08-10 19:07:45 UTC (rev 807) @@ -1,153 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <server> - <mbean code="org.jboss.ejb3.EJB3Deployer" name="jboss.ejb3:service=EJB3Deployer" - xmbean-dd=""> - - <!-- Inline XMBean Descriptor BEGIN --> - <xmbean> - <description>The EJB3Deployer responsible for ejb3 deployment</description> - <descriptors> - <interceptors> - <!-- <interceptor code="org.jboss.webservice.WebServiceInterceptor" webServiceDeployer="jboss.ws:service=WebServiceDeployerEJB3"/> --> - </interceptors> - </descriptors> - <class>org.jboss.ejb3.EJB3Deployer</class> - - <!-- ServiceMBean attributes --> - <attribute access="read-only" getMethod="getName"> - <description>The class name of the MBean</description> - <name>Name</name> - <type>java.lang.String</type> - </attribute> - - <attribute access="read-only" getMethod="getState"> - <description>The status of the MBean</description> - <name>State</name> - <type>int</type> - </attribute> - - <attribute access="read-only" getMethod="getStateString"> - <description>The status of the MBean in text form</description> - <name>StateString</name> - <type>java.lang.String</type> - </attribute> - - <!-- SubDeployerMBean attributes --> - <attribute access="read-only" getMethod="getServiceName"> - <description>The ObjectName of the Subdeployer</description> - <name>ServiceName</name> - <type>javax.management.ObjectName</type> - </attribute> - - <attribute access="read-write" getMethod="getSuffixes" setMethod="setSuffixes"> - <description>The suffixes of interest to this deployer</description> - <name>Suffixes</name> - <type>[Ljava.lang.String;</type> - </attribute> - - <attribute access="read-write" getMethod="getRelativeOrder" setMethod="setRelativeOrder"> - <description>The relative order of the suffixes in the global suffixes list</description> - <name>RelativeOrder</name> - <type>int</type> - </attribute> - - <!-- EJB3DeployerMBean attributes --> - <attribute access="read-only" getMethod="getDefaultProperties"> - <name>DefaultProperties</name> - <type>java.util.Properties</type> - </attribute> - - <!-- ServiceMBean operations --> - <operation> - <description>Standard MBean lifecycle method</description> - <name>create</name> - </operation> - - <operation> - <description>The start lifecycle operation</description> - <name>start</name> - </operation> - - <operation> - <description>The stop lifecycle operation</description> - <name>stop</name> - </operation> - - <operation> - <description>The destroy lifecycle operation</description> - <name>destroy</name> - </operation> - - <operation> - <description>The detyped lifecycle operation (for internal use only)</description> - <name>jbossInternalLifecycle</name> - <parameter> - <description>The lifecycle operation</description> - <name>method</name> - <type>java.lang.String</type> - </parameter> - <return-type>void</return-type> - </operation> - - <!-- SubDeployerMBean operations --> - <operation> - <description>Accept a module for deployment</description> - <name>accepts</name> - <parameter> - <name>info</name> - <type>org.jboss.deployment.DeploymentInfo</type> - </parameter> - <return-type>boolean</return-type> - </operation> - - <operation> - <description>Initialize deployment step</description> - <name>init</name> - <parameter> - <name>info</name> - <type>org.jboss.deployment.DeploymentInfo</type> - </parameter> - </operation> - - <operation> - <description>Create deployment step</description> - <name>create</name> - <parameter> - <name>info</name> - <type>org.jboss.deployment.DeploymentInfo</type> - </parameter> - </operation> - - <operation> - <description>Start deployment step</description> - <name>start</name> - <parameter> - <name>info</name> - <type>org.jboss.deployment.DeploymentInfo</type> - </parameter> - </operation> - - <operation> - <description>Stop deployment step</description> - <name>stop</name> - <parameter> - <name>info</name> - <type>org.jboss.deployment.DeploymentInfo</type> - </parameter> - </operation> - - <operation> - <description>Destroy deployment step</description> - <name>destroy</name> - <parameter> - <name>info</name> - <type>org.jboss.deployment.DeploymentInfo</type> - </parameter> - </operation> - </xmbean> - <!-- Inline XMBean Descriptor END --> - + <mbean code="org.jboss.ejb3.EJB3Deployer" name="jboss.ejb3:service=EJB3Deployer"> <depends>jboss.aop:service=AspectDeployer</depends> </mbean> Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties =================================================================== --- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties 2005-08-10 18:38:02 UTC (rev 806) +++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties 2005-08-10 19:07:45 UTC (rev 807) @@ -11,4 +11,5 @@ #hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache hibernate.connection.datasource=java:/DefaultDS hibernate.dialect=org.hibernate.dialect.HSQLDialect -javax.persistence.provider=org.hibernate.ejb.HibernatePersistence +hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/jboss-xb.jar =================================================================== (Binary files differ) |
From: <jbo...@li...> - 2005-08-10 18:39:25
|
Author: adamw Date: 2005-08-10 14:38:02 -0400 (Wed, 10 Aug 2005) New Revision: 806 Modified: trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/forge/listener/StartupListener.java trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java Log: EJB test Modified: trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/forge/listener/StartupListener.java =================================================================== --- trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/forge/listener/StartupListener.java 2005-08-10 16:40:23 UTC (rev 805) +++ trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/forge/listener/StartupListener.java 2005-08-10 18:38:02 UTC (rev 806) @@ -17,8 +17,8 @@ try { InitialContext ctx = new InitialContext(); Object o = ctx.lookup("org.jboss.forge.service.ForgeTimerLocal"); - o.getClass().getMethod("scheduleTimer", new Class[] { Long.TYPE }). - invoke(o, new Object[] { new Long(0) }); + //o.getClass().getMethod("scheduleTimer", new Class[] { Long.TYPE }). + // invoke(o, new Object[] { new Long(0) }); } catch (Exception e) { e.printStackTrace(); } Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java =================================================================== --- trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2005-08-10 16:40:23 UTC (rev 805) +++ trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2005-08-10 18:38:02 UTC (rev 806) @@ -6,6 +6,7 @@ import java.util.Map; import java.util.Set; +import javax.annotation.EJB; import javax.ejb.Local; import javax.ejb.Remote; @@ -128,8 +129,8 @@ } // TODO - //@EJB - //private ForgeTimerLocal timer; + @EJB + private ForgeTimerLocal timer; public void start() throws Exception { forgeHelper = new ForgeHelper(); @@ -143,7 +144,6 @@ new HashMap<CacheKey, NodeWatcher>()); toCommit = new HashSet<String>(); - // TODO // First repo update & possible checkout. try { cm.update(); @@ -161,7 +161,7 @@ // And starting the timer. //TODO - //timer.scheduleTimer(DEFAULT_TIMER_INTERVAL); + timer.scheduleTimer(DEFAULT_TIMER_INTERVAL); } public void stop() { |
Author: dam...@jb... Date: 2005-08-10 12:40:23 -0400 (Wed, 10 Aug 2005) New Revision: 805 Modified: qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java qa/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java qa/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm qa/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java qa/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm qa/forge/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java Log: MERGED: -r 797:803 https://svn.labs.jboss.com/trunk/forge/jira-extensions https://svn.labs.jboss.com/qa/forge/jira-extensions Modified: qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm =================================================================== --- qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm 2005-08-10 16:40:23 UTC (rev 805) @@ -15,7 +15,7 @@ <td bgcolor="fffff0"><h3 class="formtitle">$user</h3></td> <td> <table border="0" cellspacing="0" cellpadding="0"><tr><td width="$widths.get($user)" bgcolor="red"> - <!--<img src="/images/border/spacer.gif" height=15 width="$widths.get($user)" title="$user" border="0">--> + <img src="/images/border/spacer.gif" height=0 width="$widths.get($user)" title="$user" border="0"> </td></tr></table> </td> <td><h3 class="formtitle">$usersIssues.get($user)</h3></td> Modified: qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java =================================================================== --- qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-10 16:40:23 UTC (rev 805) @@ -171,7 +171,6 @@ } /* Iterating over all projects */ - String temp = ""; for (int i=0; i<projects.length; i++) { /* Getting issues for the given project */ Collection projectIssues = issueSearch(remoteUser, new Long(projects[i])); @@ -259,6 +258,22 @@ widths.put(key, new Integer((int)width)); } + /* Sorting the users issues list. */ + List usersIssuesList = new ArrayList(usersIssues.entrySet()); + Collections.sort(usersIssuesList, new Comparator() { + public int compare(Object arg0, Object arg1) { + Map.Entry e0 = (Map.Entry) arg0; + Map.Entry e1 = (Map.Entry) arg1; + return -((Integer) e0.getValue()).compareTo((Integer) e1.getValue()); + } + }); + + usersIssues = new LinkedHashMap(); + for (Iterator iter = usersIssuesList.iterator(); iter.hasNext();) { + Map.Entry e = (Map.Entry) iter.next(); + usersIssues.put(e.getKey(), e.getValue()); + } + /* Preparing the map with parameters for the template */ DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG); velocityParams.put("dateFormat", dateFormat); 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-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm 2005-08-10 16:40:23 UTC (rev 805) @@ -36,7 +36,8 @@ <td>$barKey</td> ##$userName.getStatuses() <td height="15"><table border="0" cellspacing="0" cellpadding="0"><tr> #foreach ($row in $bar.getRows()) - <td width="$row.getStatuses()" bgcolor="$row.getColour()"><img src="/images/border/spacer.gif" height=10 width="$row.getStatuses()" title="$row.getDescription()" border="0"></td> + <td width="$row.getStatuses()" bgcolor="$row.getColour()"> + <img src="/images/border/spacer.gif" height=0 width="$row.getStatuses()" title="$row.getDescription()" border="0"></td> #end </tr></table></td> <td>$topTenSum.get($barKey)</td> @@ -59,7 +60,8 @@ #set($proNum = $sum.get($key) * $GRAPH_MULT) <tr><td>$key</td><td> <table border="0" cellspacing="0" cellpadding="0"><tr> - <td width="$proNum" bgcolor="$colours.get($colourIt)"><img src="/images/border/spacer.gif" height=10 width="$proNum" title="$key" border="0"></td> + <td width="$proNum" bgcolor="$colours.get($colourIt)"> + <img src="/images/border/spacer.gif" height=0 width="$proNum" title="$key" border="0"></td> </tr></table> </td><td>$sum.get($key)</td></tr> #end Modified: qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java =================================================================== --- qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-10 16:40:23 UTC (rev 805) @@ -304,9 +304,15 @@ } if (before != null) { + if (before.get("newvalue") == null) + continue; + user = before.get("newvalue").toString(); } - else if(after != null) { + else if (after != null) { + if (after.get("oldvalue") == null) + continue; + user = after.get("oldvalue").toString(); } 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-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm 2005-08-10 16:40:23 UTC (rev 805) @@ -13,8 +13,8 @@ <td height="15"> <table border="0" cellpadding="0" cellspacing="0" width="$width"> <tr> - <td bgcolor="#3c78b5"> - <img src="/images/border/spacer.gif" height="10" width="$width" title="$projectNames.get($key)" border="0"> + <td bgcolor="#3c78b5" width="$width"> + <img src="/images/border/spacer.gif" height="0" width="$width" title="$projectNames.get($key)" border="0"> </td> </tr> </table> Modified: qa/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java =================================================================== --- qa/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java 2005-08-10 16:40:23 UTC (rev 805) @@ -56,7 +56,7 @@ GenericValue changeGroup = (GenericValue)changeGroups.next(); String author = changeGroup.getString("author"); Timestamp created = changeGroup.getTimestamp("created"); - System.out.println("created: "+created.toString()); + //System.out.println("created: "+created.toString()); if(created.after(startDate) && created.before(endDate)) { //System.out.println("created = "+changeGroup.get("created")+" object type "+changeGroup.get("created").getClass().getName()); @@ -77,18 +77,18 @@ private boolean isSelectedProject(Map params, Long projectId) { - System.out.println("ProjectID: "+projectId+" is being compared!"); + //System.out.println("ProjectID: "+projectId+" is being compared!"); try { String[] projectsId = (String [])params.get("projects"); for(int i = 0; i < projectsId.length; i++ ) { Long l = new Long(projectsId[i]); - System.out.println("ProjectID: trying "+projectsId[i]); + //System.out.println("ProjectID: trying "+projectsId[i]); if(l.equals(projectId)); return true; } } catch (ClassCastException e1) { String projectsId = (String)params.get("projects"); - System.out.println("ProjectID: trying a "+projectsId); + //System.out.println("ProjectID: trying a "+projectsId); Long l = new Long(projectsId); if(l.equals(projectId)) return true; @@ -148,7 +148,7 @@ Iterator issues = project.getRelated("ChildIssue").iterator(); - System.out.println("Processing project "+project.getString("name")); + //System.out.println("Processing project "+project.getString("name")); while(issues.hasNext()) { GenericValue issue = (GenericValue)issues.next(); HashSet authors = getAuthorsClosedIssue(issue,startDate,realEndDate); 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-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm 2005-08-10 16:40:23 UTC (rev 805) @@ -25,8 +25,8 @@ <td height="15"> <table border="0" cellpadding="0" cellspacing="0" width="$width"> <tr> - <td bgcolor="#3c78b5"> - <!-- <img src="/images/border/spacer.gif" height="10" width="$width" title="$pNames.get($key)" border="0">--> + <td width="$width" bgcolor="#3c78b5"> + <img src="/images/border/spacer.gif" height="0" width="$width" title="$pNames.get($key)" border="0"> </td> </tr> </table> Modified: qa/forge/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java =================================================================== --- qa/forge/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-08-10 16:40:23 UTC (rev 805) @@ -87,7 +87,6 @@ try { projectList = projectManager.getProjects(); - Object[] pList = projectList.toArray(); for (int prNum = 0; prNum < projectList.size(); prNum++) { Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-10 16:40:23 UTC (rev 805) @@ -235,7 +235,7 @@ * @throws Exception */ protected void resolveIssue(String issueId, String issueRep, String resolutionId, - String assignee) throws Exception { + String assignee, String fixVersions[]) throws Exception { wc.sendRequest(new GetMethodWebRequest(host+"/browse/"+issueRep)); wc.getCurrentPage().getLinkWith("Resolve Issue").click(); @@ -247,6 +247,7 @@ wr.setParameter("action", "5"); wr.setParameter("id", issueId); if (assignee != null) wr.setParameter("assignee", assignee); + if (fixVersions != null) wr.setParameter("fixVersions", fixVersions); wr.setParameter("viewIssueKey", ""); wc.sendRequest(wr); @@ -261,7 +262,7 @@ * @throws Exception */ protected void closeIssue(String issueId, String issueRep, String resolutionId, - String assignee) throws Exception { + String assignee, String[] fixVersions) throws Exception { wc.sendRequest(new GetMethodWebRequest(host+"/browse/"+issueRep)); wc.getCurrentPage().getLinkWith("Close Issue").click(); @@ -272,6 +273,7 @@ wr.setParameter("resolution", resolutionId); wr.setParameter("action", "2"); wr.setParameter("id", issueId); + if (fixVersions != null) wr.setParameter("fixVersions", fixVersions); if (assignee != null) wr.setParameter("assignee", assignee); wr.setParameter("viewIssueKey", ""); @@ -315,7 +317,7 @@ * @throws Exception */ protected void deleteProject(String projectId) throws Exception { - WebRequest wr = new GetMethodWebRequest(host+"/DeleteProject.jspa"); + WebRequest wr = new GetMethodWebRequest(host+"/secure/project/DeleteProject.jspa"); wr.setParameter("pid", projectId); wr.setParameter("confirm", "true"); @@ -450,7 +452,7 @@ protected String getAllValue(String name) throws Exception { String page = wc.getCurrentPage().getText(); page = page.substring(page.indexOf(name), page.length()); - page = page.substring(page.indexOf(".1."), page.length()); + page = page.substring(page.indexOf("<option value=\"")+16, page.length()); int pos = 3; while (page.charAt(pos) != '"') pos++; return page.substring(0, pos); Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java 2005-08-10 16:40:23 UTC (rev 805) @@ -50,13 +50,13 @@ for (int j=0; j<3; j++) issReps[i][j] = getIssueRepresentation(prjIds[i], "issue"+i+""+j); - closeIssue(issIds[0][0], issReps[0][0], "1", adminLogin); - closeIssue(issIds[0][2], issReps[0][2], "2", adminLogin); - closeIssue(issIds[1][1], issReps[1][1], "3", adminLogin); + closeIssue(issIds[0][0], issReps[0][0], "1", adminLogin, new String[] { verIds[0] }); + closeIssue(issIds[0][2], issReps[0][2], "2", adminLogin, new String[] { verIds[0] }); + closeIssue(issIds[1][1], issReps[1][1], "3", adminLogin, new String[] { verIds[1] }); loginUser(); - resolveIssue(issIds[0][1], issReps[0][1], "2", userLogin); - closeIssue(issIds[1][0], issReps[1][0], "3", userLogin); + resolveIssue(issIds[0][1], issReps[0][1], "2", userLogin, new String[] { verIds[0] }); + closeIssue(issIds[1][0], issReps[1][0], "3", userLogin, new String[] { verIds[1] }); } protected void tearDown() throws Exception { Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-10 16:40:23 UTC (rev 805) @@ -42,7 +42,7 @@ issRep2 = getIssueRepresentation(prjId, "issue2"); issRep3 = getIssueRepresentation(prjId, "issue3"); - closeIssue(issId1, issRep1, "3", null); + closeIssue(issId1, issRep1, "3", null, new String[] { verId1, verId2 }); } protected void tearDown() throws Exception { Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java 2005-08-10 16:40:23 UTC (rev 805) @@ -53,10 +53,10 @@ for (int j=0; j<3; j++) issReps[i][j] = getIssueRepresentation(prjIds[i], "issue"+i+""+j); - closeIssue(issIds[0][0], issReps[0][0], "1", null); - resolveIssue(issIds[0][2], issReps[0][2], "2", null); + closeIssue(issIds[0][0], issReps[0][0], "1", null, new String[] { verIds[0][0], verIds[0][1] }); + resolveIssue(issIds[0][2], issReps[0][2], "2", null, new String[] { verIds[0][1] }); - closeIssue(issIds[1][1], issReps[1][1], "3", null); + closeIssue(issIds[1][1], issReps[1][1], "3", null, new String[] { verIds[1][1] }); goToGlobalReportConf("pl.net.mamut.jira.changelogreport:changelog"); allTypes = getAllValue("types"); Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-10 16:27:00 UTC (rev 804) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-10 16:40:23 UTC (rev 805) @@ -53,10 +53,10 @@ for (int j=0; j<3; j++) issReps[i][j] = getIssueRepresentation(prjIds[i], "issue"+i+""+j); - closeIssue(issIds[0][0], issReps[0][0], "1", null); - resolveIssue(issIds[0][2], issReps[0][2], "2", null); + closeIssue(issIds[0][0], issReps[0][0], "1", null, new String[] { verIds[0][0], verIds[0][1] }); + resolveIssue(issIds[0][2], issReps[0][2], "2", null, new String[] { verIds[0][1] }); - closeIssue(issIds[1][1], issReps[1][1], "3", null); + closeIssue(issIds[1][1], issReps[1][1], "3", null, new String[] { verIds[1][1] }); goToGlobalReportConf("pl.net.mamut.jira.roadmapreport:roadmap"); allTypes = getAllValue("types"); |
From: <jbo...@li...> - 2005-08-10 16:28:23
|
Author: szimano Date: 2005-08-10 12:27:00 -0400 (Wed, 10 Aug 2005) New Revision: 804 Modified: trunk/forge/portal-extensions/forge-wiki/maven.xml trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.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/WikiPortlet.java trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp Log: file data source for reading from the jsp structure Modified: trunk/forge/portal-extensions/forge-wiki/maven.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-10 16:24:30 UTC (rev 803) +++ trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-10 16:27:00 UTC (rev 804) @@ -16,4 +16,10 @@ </ant:fileset> </ant:copy> </goal> + + <goal name="all"> + <attainGoal name="build" /> + <attainGoal name="deploy" /> + </goal> + </project> Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java 2005-08-10 16:24:30 UTC (rev 803) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java 2005-08-10 16:27:00 UTC (rev 804) @@ -5,4 +5,17 @@ * */ public class Credentials { + private String name; + + public Credentials(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java 2005-08-10 16:24:30 UTC (rev 803) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java 2005-08-10 16:27:00 UTC (rev 804) @@ -1,54 +1,255 @@ - package org.jboss.wiki; +package org.jboss.wiki; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.lang.reflect.Array; +import java.util.Date; +import java.util.Properties; + /** - * <p></p> + * <p> + * </p> * */ public class FileDataSource implements MediaDataSource { -/** - * <p>Represents ...</p> - * - */ - private String pathToMedia; + /** + * <p> + * Represents ... + * </p> + * + */ + private final String propFileName = "/home/tomek/java/sandbox/new_svn/trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties"; -public boolean preSave() { - // TODO Auto-generated method stub - return false; -} + private String pathToMedia; -public boolean savePage(WikiPage page, String languageCode) { - // TODO Auto-generated method stub - return false; -} + private Properties fileDSProps; -public boolean postSave() { - // TODO Auto-generated method stub - return false; -} + public FileDataSource() { + System.out.println("Looking for props file"); -public boolean preGet() { - // TODO Auto-generated method stub - return false; -} + fileDSProps = new Properties(); -public boolean getPage(String pageName) { - // TODO Auto-generated method stub - return false; -} + try { + fileDSProps.load(new FileInputStream(new File(propFileName))); + } catch (IOException ioe) { + System.err.println("Can't load the file " + propFileName + "\n" + + ioe); + } -public boolean postGet() { - // TODO Auto-generated method stub - return false; -} + loadProperties(); -public boolean getPage(String pageName, String languageCode) { - // TODO Auto-generated method stub - return false; -} + } -public boolean save(Media media) { - // TODO Auto-generated method stub - return false; + public void loadProperties() { + if (fileDSProps.getProperty("pathToMedia") != null) { + pathToMedia = fileDSProps.getProperty("pathToMedia"); + System.out.println("Path to media is: " + pathToMedia); + } else { + System.err + .println("Your properties file lacks of pathToMedia property. It will not run properly ! Please update " + + propFileName); + } + } + + public boolean preSave() { + // TODO Auto-generated method stub + return false; + } + + public boolean savePage(WikiPage page, String languageCode) { + // TODO Auto-generated method stub + return false; + } + + public boolean postSave() { + // TODO Auto-generated method stub + return false; + } + + public boolean preGet() { + // TODO Auto-generated method stub + return false; + } + + public Properties getPageProps(String pageName) { + Properties pageProps = new Properties(); + + try { + pageProps.load(new FileInputStream(new File(pathToMedia + "/OLD/" + + pageName + "/page.properties"))); + } catch (IOException ioe) { + System.err.println("Cannot read page.properties for page: " + + pageName + " file: " + pathToMedia + "/OLD/" + pageName + + "/page.properties\n" + ioe); + return null; + } + + return pageProps; + } + + public WikiPage getPage(String pageName) { + WikiPage page = null; + + File pageFile = new File(pathToMedia + "/" + pageName + ".txt"); + + if (pageFile.exists()) { + + Properties pageProps = getPageProps(pageName); + + if (pageProps != null) { + + int i = 1; + + // get the author of the latest version of page + while (pageProps.getProperty(String.valueOf(i + 1) + ".author") != null) { + i++; + } + + Credentials author = new Credentials(pageProps + .getProperty(String.valueOf(i) + ".author")); + + String pageContent = ""; + + try { + FileInputStream input = new FileInputStream(pageFile); + + int nextChr = input.read(); + + while (nextChr != -1) { + pageContent += (char) nextChr; + nextChr = input.read(); + } + } catch (IOException ioe) { + System.err.println(ioe); + } + + page = new WikiPage(pageName, author, pageContent, i, + new Date()); + } + } + + return page; + + } + + public boolean postGet() { + // TODO Auto-generated method stub + return false; + } + + public WikiPage getPage(String pageName, String languageCode) { + if (languageCode != null) { + System.out + .println("As for now, languages aren't supported in the wiki. Please do not use language codes"); + } + // TODO Auto-generated method stub + return getPage(pageName); + } + + public boolean save(Media media) { + // TODO Auto-generated method stub + return false; + } + + public WikiPage getPageAtVersion(String pageName, String languageCode, + int version) { + if (languageCode != null) { + System.out + .println("As for now, languages aren't supported in the wiki. Please do not use language codes"); + } + + return getPageAtVersion(pageName, version); + } + + public WikiPage getPageAtVersion(String pageName, int version) { + WikiPage page = getPage(pageName); + + if (page != null) { + if (page.getLastVersion() < version) { + System.out.println("There is no version " + version + " of page " + + pageName); + return null; + } + + page.setPageContent(getContentAtVersion(pageName, version)); + + page.setLastAuthor(getAuthorAtVersion(pageName, version)); + + } + return page; + } + + public String getContentAtVersion(String pageName, int version) { + String ret = null; + + try { + FileInputStream input = new FileInputStream(new File(pathToMedia + + "/OLD/" + pageName + "/" + version + ".txt")); + + int nextChr = input.read(); + + ret = ""; + + while (nextChr != -1) { + ret += (char) nextChr; + nextChr = input.read(); + } + } catch (IOException ioe) { + System.err.println(ioe); + } + + return ret; + } + + public Credentials getAuthorAtVersion(String pageName, int version) { + return new Credentials(getPageProps(pageName).getProperty( + version + ".author")); + } + + public static void main(String[] args) { + MediaDataSource fds = new FileDataSource(); + + String[] pageName = { "Rali", "Tomek", "Adam", "Dupa", + "WhatIsJBossForge" }; + + for (int i = 0; i < Array.getLength(pageName); i++) { + WikiPage page = fds.getPage(pageName[i]); + + if (page != null) { + page.showPage(); + } else { + System.out.println("Page " + pageName[i] + " doesn't exist"); + } + } + + WikiPage page = fds.getPageAtVersion("WhatIsJBossForge", 7); + + if (page != null) { + page.showPage(); + } else { + System.out + .println("Page WhatIsJBossForge doesn't exist at version 7"); + } + + page = fds.getPageAtVersion("Dupa", 7); + + if (page != null) { + page.showPage(); + } else { + System.out + .println("Page Dupa doesn't exist at version 7"); + } + + page = fds.getPageAtVersion("WhatIsJBossForge", 70); + + if (page != null) { + page.showPage(); + } else { + System.out + .println("Page WhatIsJBossForge doesn't exist at version 70"); + } + } + } - } Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java 2005-08-10 16:24:30 UTC (rev 803) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java 2005-08-10 16:27:00 UTC (rev 804) @@ -50,7 +50,7 @@ * @return * @param pageName */ - public boolean getPage(String pageName); + public WikiPage getPage(String pageName); /** * <p>Does ...</p> * @@ -66,7 +66,11 @@ * @return * @param languageCode */ - public boolean getPage(String pageName, String languageCode); + public WikiPage getPage(String pageName, String languageCode); + + public WikiPage getPageAtVersion(String pageName, String languageCode, int version); + + public WikiPage getPageAtVersion(String pageName, int version); } 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-10 16:24:30 UTC (rev 803) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-10 16:27:00 UTC (rev 804) @@ -108,7 +108,7 @@ * @return */ public void init() { - readPlugins(); + } /** @@ -198,10 +198,7 @@ //return null; } - public void readPlugins() { - - } -/** + /** * <p></p> * */ 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-10 16:24:30 UTC (rev 803) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java 2005-08-10 16:27:00 UTC (rev 804) @@ -1,6 +1,7 @@ package org.jboss.wiki; import java.io.Serializable; +import java.util.Date; /** * <p></p> @@ -40,7 +41,7 @@ * the plugin _must_ be the same as in the * plugin name in plugin.xml */ - private String lastAuthor; + private Credentials lastAuthor; /** * <p>Represents ...</p> @@ -52,7 +53,7 @@ * <p>Represents ...</p> * */ - private java.util.Date editDate; + private Date editDate; /** * <p>Represents ...</p> @@ -74,6 +75,8 @@ * */ public WikiEngine wikiEngine_1; + + private String pageContent; /** * <p>Does ...</p> @@ -98,8 +101,12 @@ * @param pageAuthor * @param path */ - public WikiPage(String pageName, Credentials pageAuthor, String path) { - // your code here + public WikiPage(String pageName, Credentials pageAuthor, String pageContent, int pageVersion, Date editDate) { + name = pageName; + lastAuthor = pageAuthor; + this.pageContent = pageContent; + lastVersion = pageVersion; + this.editDate = editDate; } /** @@ -175,8 +182,7 @@ * @return */ public String getContent() { - // your code here - return null; + return getPageContent(); } /** @@ -201,10 +207,58 @@ // your code here //return null; } + + public void showPage() { + System.out.println("Page name: "+getName()); + System.out.println("Page author: "+getLastAuthor().getName()); + System.out.println("Page version: "+getLastVersion()); + System.out.println("Page editdate: "+getEditDate()); + System.out.println("Page Content: \n"+getContent()); + } /** * <p></p> * */ public MediaInternalization mediaInternalization; + +public java.util.Date getEditDate() { + return editDate; +} + +public void setEditDate(java.util.Date editDate) { + this.editDate = editDate; +} + +public Credentials getLastAuthor() { + return lastAuthor; +} + +public void setLastAuthor(Credentials lastAuthor) { + this.lastAuthor = lastAuthor; +} + +public int getLastVersion() { + return lastVersion; +} + +public void setLastVersion(int lastVersion) { + this.lastVersion = lastVersion; +} + +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; +} } 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-10 16:24:30 UTC (rev 803) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-10 16:27:00 UTC (rev 804) @@ -54,9 +54,10 @@ PortletURL newAgreementURL = rRes.createActionURL(); - rReq.setAttribute("actionURL", newAgreementURL.toString()); - rReq.setAttribute("name", "ble ble"); + rReq.setAttribute("actionURL", newAgreementURL.toString()); + rReq.setAttribute("wikiName", "Szimano Wiki"); + Enumeration en = rReq.getParameterNames(); System.out.println("Parametry:"); Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2005-08-10 16:24:30 UTC (rev 803) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2005-08-10 16:27:00 UTC (rev 804) @@ -5,15 +5,16 @@ <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <%@ page isELIgnored ="false" %> <portlet:defineObjects/> - -<h2>JBoss Wiki: Main</h2> -<hr /> - <% String actionURL = (String)request.getAttribute("actionURL"); + String wikiName = (String)request.getAttribute("wikiName"); %> +<h2><%=wikiName%>: Main</h2> + +<hr /> + <form method="post" action="<%=actionURL%>"> <textarea name="wikiContent" rows="40" cols="80" style="width:100%;"> <H3>Welcome to JBoss Labs</H3> 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-10 16:24:30 UTC (rev 803) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-10 16:27:00 UTC (rev 804) @@ -6,16 +6,16 @@ <%@ page isELIgnored ="false" %> <portlet:defineObjects/> -<h2>JBoss Wiki: Main</h2> +<% + String actionURL = (String)request.getAttribute("actionURL"); + String wikiName = (String)request.getAttribute("wikiName"); +%> -<h3>Page name</h3> +<h2><%=wikiName%>: Main</h2> + <div class="wikiTrail">Your trail:</div> <hr /> -<% - String actionURL = (String)request.getAttribute("actionURL"); -%> - <table> <tr> <td class="wikiContent"> |
From: <jbo...@li...> - 2005-08-10 16:25:58
|
Author: adamw Date: 2005-08-10 12:24:30 -0400 (Wed, 10 Aug 2005) New Revision: 803 Modified: trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java Log: Sort directin fix Modified: trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java =================================================================== --- trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-10 16:09:11 UTC (rev 802) +++ trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-10 16:24:30 UTC (rev 803) @@ -264,7 +264,7 @@ public int compare(Object arg0, Object arg1) { Map.Entry e0 = (Map.Entry) arg0; Map.Entry e1 = (Map.Entry) arg1; - return ((Integer) e0.getValue()).compareTo((Integer) e1.getValue()); + return -((Integer) e0.getValue()).compareTo((Integer) e1.getValue()); } }); |
From: <jbo...@li...> - 2005-08-10 16:10:30
|
Author: adamw Date: 2005-08-10 12:09:11 -0400 (Wed, 10 Aug 2005) New Revision: 802 Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java Log: NPE fix 2 Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java =================================================================== --- trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-10 16:04:40 UTC (rev 801) +++ trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-10 16:09:11 UTC (rev 802) @@ -304,7 +304,7 @@ } if (before != null) { - if (after.get("newvalue") == null) + if (before.get("newvalue") == null) continue; user = before.get("newvalue").toString(); |
Author: adamw Date: 2005-08-10 12:04:40 -0400 (Wed, 10 Aug 2005) New Revision: 801 Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java trunk/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java Log: NPE fix 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-10 15:31:21 UTC (rev 800) +++ trunk/forge/jira-extensions/developersinvolvement-report/src/etc/templates/developersinvolvementreport/developersinvolvement-report.vm 2005-08-10 16:04:40 UTC (rev 801) @@ -36,7 +36,8 @@ <td>$barKey</td> ##$userName.getStatuses() <td height="15"><table border="0" cellspacing="0" cellpadding="0"><tr> #foreach ($row in $bar.getRows()) - <td width="$row.getStatuses()" bgcolor="$row.getColour()"><img src="/images/border/spacer.gif" height=10 width="$row.getStatuses()" title="$row.getDescription()" border="0"></td> + <td width="$row.getStatuses()" bgcolor="$row.getColour()"> + <img src="/images/border/spacer.gif" height=0 width="$row.getStatuses()" title="$row.getDescription()" border="0"></td> #end </tr></table></td> <td>$topTenSum.get($barKey)</td> @@ -59,7 +60,8 @@ #set($proNum = $sum.get($key) * $GRAPH_MULT) <tr><td>$key</td><td> <table border="0" cellspacing="0" cellpadding="0"><tr> - <td width="$proNum" bgcolor="$colours.get($colourIt)"><img src="/images/border/spacer.gif" height=10 width="$proNum" title="$key" border="0"></td> + <td width="$proNum" bgcolor="$colours.get($colourIt)"> + <img src="/images/border/spacer.gif" height=0 width="$proNum" title="$key" border="0"></td> </tr></table> </td><td>$sum.get($key)</td></tr> #end Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java =================================================================== --- trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-10 15:31:21 UTC (rev 800) +++ trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-10 16:04:40 UTC (rev 801) @@ -304,6 +304,9 @@ } if (before != null) { + if (after.get("newvalue") == null) + continue; + user = before.get("newvalue").toString(); } else if (after != null) { Modified: trunk/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java =================================================================== --- trunk/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java 2005-08-10 15:31:21 UTC (rev 800) +++ trunk/forge/jira-extensions/developersperproject-report/src/java/br/ufrj/jira/DevelopersPerProjectReport.java 2005-08-10 16:04:40 UTC (rev 801) @@ -56,7 +56,7 @@ GenericValue changeGroup = (GenericValue)changeGroups.next(); String author = changeGroup.getString("author"); Timestamp created = changeGroup.getTimestamp("created"); - System.out.println("created: "+created.toString()); + //System.out.println("created: "+created.toString()); if(created.after(startDate) && created.before(endDate)) { //System.out.println("created = "+changeGroup.get("created")+" object type "+changeGroup.get("created").getClass().getName()); @@ -77,18 +77,18 @@ private boolean isSelectedProject(Map params, Long projectId) { - System.out.println("ProjectID: "+projectId+" is being compared!"); + //System.out.println("ProjectID: "+projectId+" is being compared!"); try { String[] projectsId = (String [])params.get("projects"); for(int i = 0; i < projectsId.length; i++ ) { Long l = new Long(projectsId[i]); - System.out.println("ProjectID: trying "+projectsId[i]); + //System.out.println("ProjectID: trying "+projectsId[i]); if(l.equals(projectId)); return true; } } catch (ClassCastException e1) { String projectsId = (String)params.get("projects"); - System.out.println("ProjectID: trying a "+projectsId); + //System.out.println("ProjectID: trying a "+projectsId); Long l = new Long(projectsId); if(l.equals(projectId)) return true; @@ -148,7 +148,7 @@ Iterator issues = project.getRelated("ChildIssue").iterator(); - System.out.println("Processing project "+project.getString("name")); + //System.out.println("Processing project "+project.getString("name")); while(issues.hasNext()) { GenericValue issue = (GenericValue)issues.next(); HashSet authors = getAuthorsClosedIssue(issue,startDate,realEndDate); |
Author: adamw Date: 2005-08-10 11:31:21 -0400 (Wed, 10 Aug 2005) New Revision: 800 Modified: trunk/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 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/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java Log: JIRA fixes Modified: trunk/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm =================================================================== --- trunk/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm 2005-08-09 22:03:03 UTC (rev 799) +++ trunk/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm 2005-08-10 15:31:21 UTC (rev 800) @@ -15,7 +15,7 @@ <td bgcolor="fffff0"><h3 class="formtitle">$user</h3></td> <td> <table border="0" cellspacing="0" cellpadding="0"><tr><td width="$widths.get($user)" bgcolor="red"> - <!--<img src="/images/border/spacer.gif" height=15 width="$widths.get($user)" title="$user" border="0">--> + <img src="/images/border/spacer.gif" height=0 width="$widths.get($user)" title="$user" border="0"> </td></tr></table> </td> <td><h3 class="formtitle">$usersIssues.get($user)</h3></td> Modified: trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java =================================================================== --- trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-09 22:03:03 UTC (rev 799) +++ trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-10 15:31:21 UTC (rev 800) @@ -171,7 +171,6 @@ } /* Iterating over all projects */ - String temp = ""; for (int i=0; i<projects.length; i++) { /* Getting issues for the given project */ Collection projectIssues = issueSearch(remoteUser, new Long(projects[i])); @@ -259,6 +258,22 @@ widths.put(key, new Integer((int)width)); } + /* Sorting the users issues list. */ + List usersIssuesList = new ArrayList(usersIssues.entrySet()); + Collections.sort(usersIssuesList, new Comparator() { + public int compare(Object arg0, Object arg1) { + Map.Entry e0 = (Map.Entry) arg0; + Map.Entry e1 = (Map.Entry) arg1; + return ((Integer) e0.getValue()).compareTo((Integer) e1.getValue()); + } + }); + + usersIssues = new LinkedHashMap(); + for (Iterator iter = usersIssuesList.iterator(); iter.hasNext();) { + Map.Entry e = (Map.Entry) iter.next(); + usersIssues.put(e.getKey(), e.getValue()); + } + /* Preparing the map with parameters for the template */ DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG); velocityParams.put("dateFormat", dateFormat); Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java =================================================================== --- trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-09 22:03:03 UTC (rev 799) +++ trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-10 15:31:21 UTC (rev 800) @@ -306,7 +306,10 @@ if (before != null) { user = before.get("newvalue").toString(); } - else if(after != null) { + else if (after != null) { + if (after.get("oldvalue") == null) + continue; + user = after.get("oldvalue").toString(); } 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-09 22:03:03 UTC (rev 799) +++ trunk/forge/jira-extensions/developersperproject-report/src/etc/templates/developersperprojectreport/developersperproject-report.vm 2005-08-10 15:31:21 UTC (rev 800) @@ -13,8 +13,8 @@ <td height="15"> <table border="0" cellpadding="0" cellspacing="0" width="$width"> <tr> - <td bgcolor="#3c78b5"> - <img src="/images/border/spacer.gif" height="10" width="$width" title="$projectNames.get($key)" border="0"> + <td bgcolor="#3c78b5" width="$width"> + <img src="/images/border/spacer.gif" height="0" width="$width" title="$projectNames.get($key)" border="0"> </td> </tr> </table> 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-09 22:03:03 UTC (rev 799) +++ trunk/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm 2005-08-10 15:31:21 UTC (rev 800) @@ -25,8 +25,8 @@ <td height="15"> <table border="0" cellpadding="0" cellspacing="0" width="$width"> <tr> - <td bgcolor="#3c78b5"> - <!-- <img src="/images/border/spacer.gif" height="10" width="$width" title="$pNames.get($key)" border="0">--> + <td width="$width" bgcolor="#3c78b5"> + <img src="/images/border/spacer.gif" height="0" width="$width" title="$pNames.get($key)" border="0"> </td> </tr> </table> Modified: trunk/forge/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java =================================================================== --- trunk/forge/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-08-09 22:03:03 UTC (rev 799) +++ trunk/forge/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-08-10 15:31:21 UTC (rev 800) @@ -87,7 +87,6 @@ try { projectList = projectManager.getProjects(); - Object[] pList = projectList.toArray(); for (int prNum = 0; prNum < projectList.size(); prNum++) { Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java =================================================================== --- trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-09 22:03:03 UTC (rev 799) +++ trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-10 15:31:21 UTC (rev 800) @@ -235,7 +235,7 @@ * @throws Exception */ protected void resolveIssue(String issueId, String issueRep, String resolutionId, - String assignee) throws Exception { + String assignee, String fixVersions[]) throws Exception { wc.sendRequest(new GetMethodWebRequest(host+"/browse/"+issueRep)); wc.getCurrentPage().getLinkWith("Resolve Issue").click(); @@ -247,6 +247,7 @@ wr.setParameter("action", "5"); wr.setParameter("id", issueId); if (assignee != null) wr.setParameter("assignee", assignee); + if (fixVersions != null) wr.setParameter("fixVersions", fixVersions); wr.setParameter("viewIssueKey", ""); wc.sendRequest(wr); @@ -261,7 +262,7 @@ * @throws Exception */ protected void closeIssue(String issueId, String issueRep, String resolutionId, - String assignee) throws Exception { + String assignee, String[] fixVersions) throws Exception { wc.sendRequest(new GetMethodWebRequest(host+"/browse/"+issueRep)); wc.getCurrentPage().getLinkWith("Close Issue").click(); @@ -272,6 +273,7 @@ wr.setParameter("resolution", resolutionId); wr.setParameter("action", "2"); wr.setParameter("id", issueId); + if (fixVersions != null) wr.setParameter("fixVersions", fixVersions); if (assignee != null) wr.setParameter("assignee", assignee); wr.setParameter("viewIssueKey", ""); @@ -315,7 +317,7 @@ * @throws Exception */ protected void deleteProject(String projectId) throws Exception { - WebRequest wr = new GetMethodWebRequest(host+"/DeleteProject.jspa"); + WebRequest wr = new GetMethodWebRequest(host+"/secure/project/DeleteProject.jspa"); wr.setParameter("pid", projectId); wr.setParameter("confirm", "true"); @@ -450,7 +452,7 @@ protected String getAllValue(String name) throws Exception { String page = wc.getCurrentPage().getText(); page = page.substring(page.indexOf(name), page.length()); - page = page.substring(page.indexOf(".1."), page.length()); + page = page.substring(page.indexOf("<option value=\"")+16, page.length()); int pos = 3; while (page.charAt(pos) != '"') pos++; return page.substring(0, pos); Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java =================================================================== --- trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java 2005-08-09 22:03:03 UTC (rev 799) +++ trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java 2005-08-10 15:31:21 UTC (rev 800) @@ -50,13 +50,13 @@ for (int j=0; j<3; j++) issReps[i][j] = getIssueRepresentation(prjIds[i], "issue"+i+""+j); - closeIssue(issIds[0][0], issReps[0][0], "1", adminLogin); - closeIssue(issIds[0][2], issReps[0][2], "2", adminLogin); - closeIssue(issIds[1][1], issReps[1][1], "3", adminLogin); + closeIssue(issIds[0][0], issReps[0][0], "1", adminLogin, new String[] { verIds[0] }); + closeIssue(issIds[0][2], issReps[0][2], "2", adminLogin, new String[] { verIds[0] }); + closeIssue(issIds[1][1], issReps[1][1], "3", adminLogin, new String[] { verIds[1] }); loginUser(); - resolveIssue(issIds[0][1], issReps[0][1], "2", userLogin); - closeIssue(issIds[1][0], issReps[1][0], "3", userLogin); + resolveIssue(issIds[0][1], issReps[0][1], "2", userLogin, new String[] { verIds[0] }); + closeIssue(issIds[1][0], issReps[1][0], "3", userLogin, new String[] { verIds[1] }); } protected void tearDown() throws Exception { Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java =================================================================== --- trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-09 22:03:03 UTC (rev 799) +++ trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-10 15:31:21 UTC (rev 800) @@ -42,7 +42,7 @@ issRep2 = getIssueRepresentation(prjId, "issue2"); issRep3 = getIssueRepresentation(prjId, "issue3"); - closeIssue(issId1, issRep1, "3", null); + closeIssue(issId1, issRep1, "3", null, new String[] { verId1, verId2 }); } protected void tearDown() throws Exception { Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java =================================================================== --- trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java 2005-08-09 22:03:03 UTC (rev 799) +++ trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java 2005-08-10 15:31:21 UTC (rev 800) @@ -53,10 +53,10 @@ for (int j=0; j<3; j++) issReps[i][j] = getIssueRepresentation(prjIds[i], "issue"+i+""+j); - closeIssue(issIds[0][0], issReps[0][0], "1", null); - resolveIssue(issIds[0][2], issReps[0][2], "2", null); + closeIssue(issIds[0][0], issReps[0][0], "1", null, new String[] { verIds[0][0], verIds[0][1] }); + resolveIssue(issIds[0][2], issReps[0][2], "2", null, new String[] { verIds[0][1] }); - closeIssue(issIds[1][1], issReps[1][1], "3", null); + closeIssue(issIds[1][1], issReps[1][1], "3", null, new String[] { verIds[1][1] }); goToGlobalReportConf("pl.net.mamut.jira.changelogreport:changelog"); allTypes = getAllValue("types"); Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java =================================================================== --- trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-09 22:03:03 UTC (rev 799) +++ trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-10 15:31:21 UTC (rev 800) @@ -53,10 +53,10 @@ for (int j=0; j<3; j++) issReps[i][j] = getIssueRepresentation(prjIds[i], "issue"+i+""+j); - closeIssue(issIds[0][0], issReps[0][0], "1", null); - resolveIssue(issIds[0][2], issReps[0][2], "2", null); + closeIssue(issIds[0][0], issReps[0][0], "1", null, new String[] { verIds[0][0], verIds[0][1] }); + resolveIssue(issIds[0][2], issReps[0][2], "2", null, new String[] { verIds[0][1] }); - closeIssue(issIds[1][1], issReps[1][1], "3", null); + closeIssue(issIds[1][1], issReps[1][1], "3", null, new String[] { verIds[1][1] }); goToGlobalReportConf("pl.net.mamut.jira.roadmapreport:roadmap"); allTypes = getAllValue("types"); |
From: <jbo...@li...> - 2005-08-09 22:22:54
|
Author: adamw Date: 2005-08-09 16:58:21 -0400 (Tue, 09 Aug 2005) New Revision: 797 Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java Log: Bug fix Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java =================================================================== --- trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-09 20:51:47 UTC (rev 796) +++ trunk/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-09 20:58:21 UTC (rev 797) @@ -238,6 +238,7 @@ Object project = ((GenericValue)issueList.get(i)).get("project"); + if ((((GenericValue)issueList.get(i)).get("assignee")) == null) continue; String user = (((GenericValue)issueList.get(i)).get("assignee")).toString(); Vector assignChanges = new Vector(); |
From: <jbo...@li...> - 2005-08-09 22:12:21
|
Author: adamw Date: 2005-08-09 16:39:09 -0400 (Tue, 09 Aug 2005) New Revision: 795 Modified: trunk/forge/jira-extensions/developer-issues-report/.classpath trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java Log: Bug fix Modified: trunk/forge/jira-extensions/developer-issues-report/.classpath =================================================================== --- trunk/forge/jira-extensions/developer-issues-report/.classpath 2005-08-09 18:13:06 UTC (rev 794) +++ trunk/forge/jira-extensions/developer-issues-report/.classpath 2005-08-09 20:39:09 UTC (rev 795) @@ -5,27 +5,27 @@ </classpathentry> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira/jars/atlassian-jira-3.0.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira/jars/atlassian-jira-3.2.jar"> </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/global-reports-plugins/jars/global-reports-plugins-1.0.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-core/jars/atlassian-core-2.2.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-core/jars/atlassian-core-2.3.9.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-ofbiz/jars/atlassian-ofbiz-0.1.8.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-ofbiz/jars/atlassian-ofbiz-0.2.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-profiling/jars/atlassian-profiling-1.1.1.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-profiling/jars/atlassian-profiling-1.1.4.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-configurableobjects/jars/atlassian-configurableobjects-0.4.5.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-configurableobjects/jars/atlassian-configurableobjects-0.4.11.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-mail/jars/atlassian-mail-1.2.13.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-mail/jars/atlassian-mail-1.2.30.jar"> </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/atlassian-scheduler/jars/atlassian-scheduler-0.6.6.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-velocity/jars/atlassian-velocity-0.1.8.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-velocity/jars/atlassian-velocity-0.3.9.jar"> </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/atlassian-johnson/jars/atlassian-johnson-0.5.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-plugins/jars/atlassian-plugins-0.2.7.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-plugins/jars/atlassian-plugins-0.4.jar"> </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/seraph/jars/seraph-0.7.5.jar"> </classpathentry> Modified: trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java =================================================================== --- trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-09 18:13:06 UTC (rev 794) +++ trunk/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-09 20:39:09 UTC (rev 795) @@ -229,7 +229,7 @@ /* If this issue matches our criteria (e.g. has been resolved in the given time * frame), we add one issue to the assignee that resolved it. */ - if (put) + if (put && (currentAssignee != null)) usersIssues.put(currentAssignee, new Integer( ((Integer)usersIssues.get(currentAssignee)).intValue()+1)); } |
Author: dam...@jb... Date: 2005-08-09 18:03:03 -0400 (Tue, 09 Aug 2005) New Revision: 799 Added: qa/forge/jira-extensions/multiselect/jira-3.2/edit-webapp/WEB-INF/ qa/forge/jira-extensions/multiselect/jira-3.2/edit-webapp/WEB-INF/lib/ qa/forge/jira-extensions/multiselect/jira-3.2/edit-webapp/WEB-INF/lib/atlassian-configurableobjects-0.4.9.jar Removed: qa/forge/jira-extensions/developersinvolvement-report/common.xml qa/forge/jira-extensions/developersperproject-report/common.xml qa/forge/jira-extensions/issuesclosed-report/common.xml qa/forge/jira-extensions/multiselect/jira-3.2/edit-webapp/WEB-INF/lib/ qa/forge/jira-extensions/multiselect/jira-3.2/edit-webapp/WEB-INF/lib/atlassian-configurableobjects-0.4.9.jar qa/forge/jira-extensions/releasenotes-affect-report/common.xml Modified: qa/forge/jira-extensions/build.properties.sample qa/forge/jira-extensions/changelog-report/.classpath qa/forge/jira-extensions/changelog-report/.project qa/forge/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java qa/forge/jira-extensions/common.xml qa/forge/jira-extensions/developer-issues-report/.classpath qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java qa/forge/jira-extensions/developersinvolvement-report/project.xml qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java qa/forge/jira-extensions/developersperproject-report/project.xml qa/forge/jira-extensions/globalreports-plugins/common.xml qa/forge/jira-extensions/issuesclosed-report/project.xml qa/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm qa/forge/jira-extensions/junit-tests-adamw/.classpath qa/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java qa/forge/jira-extensions/maven.xml qa/forge/jira-extensions/releasenotes-affect-report/project.xml qa/forge/jira-extensions/releasenotes-report/.classpath qa/forge/jira-extensions/releasenotes-report/.project qa/forge/jira-extensions/roadmap-report/.classpath qa/forge/jira-extensions/roadmap-report/.project qa/forge/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java qa/forge/jira-extensions/voting/jira-3.2/edit-webapp/WEB-INF/classes/entitydefs/entitymodel.xml qa/forge/jira-extensions/voting/jira-3.2/edit-webapp/secure/admin/views/voting/addvotesassigment.jsp Log: MERGED: -r 779:797 https://svn.labs.jboss.com/trunk/forge/jira-extensions https://svn.labs.jboss.com/qa/forge/jira-extensions Modified: qa/forge/jira-extensions/build.properties.sample =================================================================== --- qa/forge/jira-extensions/build.properties.sample 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/build.properties.sample 2005-08-09 22:03:03 UTC (rev 799) @@ -1,13 +1,13 @@ -# Path to the root directory of your JIRA installation +# Path to the root directory of your JIRA installation. jira.local.path= # Directory containing the web application. Should be edit-webapp for # the in-application-server version and atlassian-jira for the # standalone version. jira.web.directory= -# Your JIRA version. Supported versions: 3.0 and 3.1. -jira.version= +# Your JIRA version. Supported versions: 3.2. +jira.version=3.2 # Path where web the JIRA web application is to be deployed (only the -# application server version). +# application server version, should end with /deploy). appserv.local.path= # Path to your local maven repository. -maven.repo.local= +#maven.repo.local= Modified: qa/forge/jira-extensions/changelog-report/.classpath =================================================================== --- qa/forge/jira-extensions/changelog-report/.classpath 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/changelog-report/.classpath 2005-08-09 22:03:03 UTC (rev 799) @@ -1,352 +1,182 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <classpathentry kind="src" path="src/java"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira/jars/atlassian-jira-3.0.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-core/jars/atlassian-core-2.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-ofbiz/jars/atlassian-ofbiz-0.1.8.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-profiling/jars/atlassian-profiling-1.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-configurableobjects/jars/atlassian-configurableobjects-0.4.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-mail/jars/atlassian-mail-1.2.13.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-scheduler/jars/atlassian-scheduler-0.6.6.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-velocity/jars/atlassian-velocity-0.1.8.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-johnson/jars/atlassian-johnson-0.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-plugins/jars/atlassian-plugins-0.2.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/seraph/jars/seraph-0.7.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira-extras/jars/atlassian-jira-extras-0.5.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-tagutil/jars/atlassian-tagutil-0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/oscache/jars/oscache-DEV.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/osworkflow/jars/osworkflow-17Aug2004.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/oscore/jars/oscore-2.2.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/osuser/jars/osuser-1.0-dev-28Jul04.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/propertyset/jars/propertyset-1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/sitemesh/jars/sitemesh-2.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-1.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-pell-multipartrequest1.30rc1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-digester/jars/commons-digester-1.4.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-2.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-1.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/lucene/jars/lucene-1.4-final.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-jdk1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-j1.3-j2ee1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-DEV.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymock-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymockclassextension-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-j1.3-j2ee1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-jdk1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/activation/jars/activation-1.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/javamail/jars/javamail-1.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/glue/jars/glue-5.0b2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/bsf/jars/bsf-2.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/bsh/jars/bsh-1.2b7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-share-2.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-entity-2.1.1-atlassian-01042004.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-service-2.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-extutil-2.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/csv/jars/csv-20.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-xerces-serialize.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/quartz/jars/quartz-1.0.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/picocontainer/jars/picocontainer-1.0.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jzlib/jars/jzlib-1.0.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jsch/jars/jsch-0.1.16-20040721-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/javacvs/jars/javacvs-20040721-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/statcvs/jars/statcvs-20040721-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.1-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jndi/jars/jndi-1.2.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jta/jars/jta-1.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ots-jts/jars/ots-jts_1.0.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-jrmp_stubs-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-iiop_stubs-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jonas_timer-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/objectweb-datasource-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-1.5.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-properties.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/xapool/jars/xapool-1.3.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xerces-1.4.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-20030310.073407.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-junit-20030211.141731.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-util-20030211.141939.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-email-20030211.144034.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-log-20030211.142821.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-http-20030211.143043.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-soap-20030211.142401.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-sql-20030211.144816.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jexl/jars/commons-jexl-1.0-beta-2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-trackback/jars/atlassian-trackback-0.7.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0-beta2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/xmlrpc/jars/xmlrpc-1.2-b1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.4.2"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry excluding="" kind="src" path="src/java"> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira/jars/atlassian-jira-3.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/global-reports-plugins/jars/global-reports-plugins-1.0.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-core/jars/atlassian-core-2.3.9.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-ofbiz/jars/atlassian-ofbiz-0.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-profiling/jars/atlassian-profiling-1.1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-configurableobjects/jars/atlassian-configurableobjects-0.4.11.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-mail/jars/atlassian-mail-1.2.30.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-scheduler/jars/atlassian-scheduler-0.6.6.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-velocity/jars/atlassian-velocity-0.3.9.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-johnson/jars/atlassian-johnson-0.5.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-plugins/jars/atlassian-plugins-0.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/seraph/jars/seraph-0.7.5.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira-extras/jars/atlassian-jira-extras-0.5.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-tagutil/jars/atlassian-tagutil-0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/oscache/jars/oscache-DEV.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/osworkflow/jars/osworkflow-17Aug2004.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/oscore/jars/oscore-2.2.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/osuser/jars/osuser-1.0-dev-28Jul04.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/propertyset/jars/propertyset-1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/sitemesh/jars/sitemesh-2.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-pell-multipartrequest1.30rc1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-digester/jars/commons-digester-1.4.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-2.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-1.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/lucene/jars/lucene-1.4-final.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-jdk1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-j1.3-j2ee1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-DEV.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymock-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymockclassextension-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-j1.3-j2ee1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-jdk1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/activation/jars/activation-1.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/javamail/jars/javamail-1.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/glue/jars/glue-5.0b2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/bsf/jars/bsf-2.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/bsh/jars/bsh-1.2b7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-share-2.1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-entity-2.1.1-atlassian-01042004.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-service-2.1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-extutil-2.1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/csv/jars/csv-20.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-xerces-serialize.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/quartz/jars/quartz-1.0.7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/picocontainer/jars/picocontainer-1.0.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jzlib/jars/jzlib-1.0.5.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jsch/jars/jsch-0.1.16-20040721-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/javacvs/jars/javacvs-20040721-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/statcvs/jars/statcvs-20040721-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.1-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jndi/jars/jndi-1.2.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jta/jars/jta-1.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ots-jts/jars/ots-jts_1.0.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-jrmp_stubs-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-iiop_stubs-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jonas_timer-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/objectweb-datasource-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-1.5.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-properties.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/xapool/jars/xapool-1.3.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xerces-1.4.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-20030310.073407.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-junit-20030211.141731.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-util-20030211.141939.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-email-20030211.144034.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-log-20030211.142821.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-http-20030211.143043.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-soap-20030211.142401.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-sql-20030211.144816.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jexl/jars/commons-jexl-1.0-beta-2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-trackback/jars/atlassian-trackback-0.7.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0-beta2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/xmlrpc/jars/xmlrpc-1.2-b1.jar"> + </classpathentry> + <classpathentry kind="output" path="target/classes"> + </classpathentry> +</classpath> \ No newline at end of file Modified: qa/forge/jira-extensions/changelog-report/.project =================================================================== --- qa/forge/jira-extensions/changelog-report/.project 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/changelog-report/.project 2005-08-09 22:03:03 UTC (rev 799) @@ -1,27 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> - <name>Release Notes Reports</name> - <comment>An extended release notes plugin.</comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/Maven.launch</value> - </dictionary> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> + <name>plugin-globalreport-changelog</name> + <comment>A changelog global report plugin.</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Modified: qa/forge/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java =================================================================== --- qa/forge/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-09 22:03:03 UTC (rev 799) @@ -27,6 +27,7 @@ import com.atlassian.jira.web.util.OutlookDateManager; import com.opensymphony.user.User; +import java.sql.Timestamp; import java.text.DateFormat; import java.util.*; @@ -225,10 +226,15 @@ { Version version = (Version) iter.next(); + Timestamp beginTs = new Timestamp(beginDate.getTime()); + Timestamp endTs = new Timestamp(endDate.getTime()); + /* Checking if the version is released in the specified period */ if ((version.isReleased()) && (version.getReleaseDate() != null) - && (version.getReleaseDate().compareTo(beginDate) >= 0) - && (version.getReleaseDate().compareTo(endDate) <= 0)) + && (version.getReleaseDate().compareTo(beginTs) + >= 0) + && (version.getReleaseDate().compareTo(endTs) + <= 0)) { Collection versionsCol = new ArrayList(); versionsCol.add(version.getId()); Modified: qa/forge/jira-extensions/common.xml =================================================================== --- qa/forge/jira-extensions/common.xml 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/common.xml 2005-08-09 22:03:03 UTC (rev 799) @@ -6,7 +6,7 @@ <dependencies> <dependency> <id>atlassian-jira</id> - <version>3.0</version> + <version>3.2</version> </dependency> <dependency> @@ -16,27 +16,27 @@ <dependency> <id>atlassian-core</id> - <version>2.2</version> + <version>2.3.9</version> </dependency> <dependency> <id>atlassian-ofbiz</id> - <version>0.1.8</version> + <version>0.2</version> </dependency> <dependency> <id>atlassian-profiling</id> - <version>1.1.1</version> + <version>1.1.4</version> </dependency> <dependency> <id>atlassian-configurableobjects</id> - <version>0.4.5</version> + <version>0.4.11</version> </dependency> <dependency> <id>atlassian-mail</id> - <version>1.2.13</version> + <version>1.2.30</version> </dependency> <dependency> @@ -46,7 +46,7 @@ <dependency> <id>atlassian-velocity</id> - <version>0.1.8</version> + <version>0.3.9</version> </dependency> <dependency> @@ -56,7 +56,7 @@ <dependency> <id>atlassian-plugins</id> - <version>0.2.7</version> + <version>0.4</version> </dependency> <dependency> Modified: qa/forge/jira-extensions/developer-issues-report/.classpath =================================================================== --- qa/forge/jira-extensions/developer-issues-report/.classpath 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/developer-issues-report/.classpath 2005-08-09 22:03:03 UTC (rev 799) @@ -5,27 +5,27 @@ </classpathentry> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira/jars/atlassian-jira-3.0.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira/jars/atlassian-jira-3.2.jar"> </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/global-reports-plugins/jars/global-reports-plugins-1.0.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-core/jars/atlassian-core-2.2.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-core/jars/atlassian-core-2.3.9.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-ofbiz/jars/atlassian-ofbiz-0.1.8.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-ofbiz/jars/atlassian-ofbiz-0.2.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-profiling/jars/atlassian-profiling-1.1.1.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-profiling/jars/atlassian-profiling-1.1.4.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-configurableobjects/jars/atlassian-configurableobjects-0.4.5.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-configurableobjects/jars/atlassian-configurableobjects-0.4.11.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-mail/jars/atlassian-mail-1.2.13.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-mail/jars/atlassian-mail-1.2.30.jar"> </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/atlassian-scheduler/jars/atlassian-scheduler-0.6.6.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-velocity/jars/atlassian-velocity-0.1.8.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-velocity/jars/atlassian-velocity-0.3.9.jar"> </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/atlassian-johnson/jars/atlassian-johnson-0.5.jar"> </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-plugins/jars/atlassian-plugins-0.2.7.jar"> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-plugins/jars/atlassian-plugins-0.4.jar"> </classpathentry> <classpathentry kind="var" path="MAVEN_REPO/seraph/jars/seraph-0.7.5.jar"> </classpathentry> Modified: qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm =================================================================== --- qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm 2005-08-09 22:03:03 UTC (rev 799) @@ -15,7 +15,7 @@ <td bgcolor="fffff0"><h3 class="formtitle">$user</h3></td> <td> <table border="0" cellspacing="0" cellpadding="0"><tr><td width="$widths.get($user)" bgcolor="red"> - <img src="/images/border/spacer.gif" height=15 width="$widths.get($user)" title="$user" border="0"> + <!--<img src="/images/border/spacer.gif" height=15 width="$widths.get($user)" title="$user" border="0">--> </td></tr></table> </td> <td><h3 class="formtitle">$usersIssues.get($user)</h3></td> Modified: qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java =================================================================== --- qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-09 22:03:03 UTC (rev 799) @@ -229,7 +229,7 @@ /* If this issue matches our criteria (e.g. has been resolved in the given time * frame), we add one issue to the assignee that resolved it. */ - if (put) + if (put && (currentAssignee != null)) usersIssues.put(currentAssignee, new Integer( ((Integer)usersIssues.get(currentAssignee)).intValue()+1)); } Deleted: qa/forge/jira-extensions/developersinvolvement-report/common.xml =================================================================== --- qa/forge/jira-extensions/developersinvolvement-report/common.xml 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/developersinvolvement-report/common.xml 2005-08-09 22:03:03 UTC (rev 799) @@ -1,492 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> -<project> - <pomVersion>3</pomVersion> - - - <dependencies> - <dependency> - <id>global-reports-plugins</id> - <version>1.0</version> - </dependency> - - <dependency> - <id>atlassian-jira</id> - <version>3.0</version> - </dependency> - - <dependency> - <id>atlassian-core</id> - <version>2.2</version> - </dependency> - - <dependency> - <id>atlassian-ofbiz</id> - <version>0.1.8</version> - </dependency> - - <dependency> - <id>atlassian-profiling</id> - <version>1.1.1</version> - </dependency> - - <dependency> - <id>atlassian-configurableobjects</id> - <version>0.4.5</version> - </dependency> - - <dependency> - <id>atlassian-mail</id> - <version>1.2.13</version> - </dependency> - - <dependency> - <id>atlassian-scheduler</id> - <version>0.6.6</version> - </dependency> - - <dependency> - <id>atlassian-velocity</id> - <version>0.1.8</version> - </dependency> - - <dependency> - <id>atlassian-johnson</id> - <version>0.5</version> - </dependency> - - <dependency> - <id>atlassian-plugins</id> - <version>0.2.7</version> - </dependency> - - <dependency> - <id>seraph</id> - <version>0.7.5</version> - </dependency> - - <!-- Atlassian jar dependencies --> - <dependency> - <id>atlassian-jira-extras</id> - <version>0.5.2</version> - </dependency> - - <dependency> - <id>atlassian-tagutil</id> - <version>0.1</version> - </dependency> - - <!-- OS dependencies --> - <dependency> - <id>oscache</id> - <version>DEV</version> - </dependency> - - <dependency> - <id>osworkflow</id> - <version>17Aug2004</version> - </dependency> - - <dependency> - <id>oscore</id> - <version>2.2.4</version> - </dependency> - - <dependency> - <id>osuser</id> - <version>1.0-dev-28Jul04</version> - </dependency> - - <dependency> - <id>propertyset</id> - <version>1.3</version> - </dependency> - - <dependency> - <id>sitemesh</id> - <version>2.1</version> - </dependency> - - <dependency> - <id>webwork</id> - <version>1.4</version> - </dependency> - - <dependency> - <id>webwork+pell</id> - <version>multipartrequest1.30rc1</version> - </dependency> - - <!-- Jakarta dependencies --> - <dependency> - <id>commons-digester</id> - <version>1.4.1</version> - </dependency> - - <dependency> - <id>commons-beanutils</id> - <version>1.6.1</version> - </dependency> - - <dependency> - <id>commons-logging</id> - <version>1.0.3</version> - </dependency> - - <dependency> - <id>commons-collections</id> - <version>2.1</version> - </dependency> - - <dependency> - <id>commons-lang</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>log4j</id> - <version>1.2.7</version> - <url>http://jakarta.apache.org/log4j</url> - </dependency> - - <dependency> - <id>lucene</id> - <version>1.4-final</version> - </dependency> - - <dependency> - <id>oro</id> - <version>2.0.7</version> - </dependency> - - <dependency> - <id>velocity</id> - <version>1.4</version> - </dependency> - - <!-- Testing / Mock dependencies --> - <dependency> - <id>alt</id> - <version>0.07-jdk1.3</version> - </dependency> - - <dependency> - <id>alt+j2ee</id> - <version>0.07-jdk1.3</version> - <jar>alt-0.07-j1.3-j2ee1.3.jar</jar> - </dependency> - - <dependency> - <id>junit</id> - <version>3.8.1</version> </dependency> - - <dependency> - <id>mockobjects</id> - <version>DEV</version> - </dependency> - - <dependency> - <id>easymock</id> - <groupId>easymock</groupId> - <version>1.1</version> - </dependency> - - <dependency> - <id>cglib-full</id> - <groupId>cglib</groupId> - <artifactId>cglib-full</artifactId> - <version>2.0.1</version> - </dependency> - - <dependency> - <id>easymockextension</id> - <groupId>easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <id>mockobjects+j2ee</id> - <version>0.07-jdk1.3</version> - <jar>mockobjects-0.07-j1.3-j2ee1.3.jar</jar> - </dependency> - - <dependency> - <id>mockobjects+jdk</id> - <version>0.07-jdk1.3</version> - <jar>mockobjects-0.07-jdk1.3.jar</jar> - </dependency> - - <!-- javax dependencies --> - <dependency> - <id>activation</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>javamail</id> - <version>1.2</version> - </dependency> - - <dependency> - <id>servletapi</id> - <version>2.3</version> </dependency> - - <!-- Misc dependencies --> - <dependency> - <id>glue</id> - <version>5.0b2</version> - </dependency> - - <dependency> - <id>bsf</id> - <version>2.2</version> - </dependency> - - <dependency> - <id>bsh</id> - <version>1.2b7</version> - </dependency> - - <dependency> - <id>ofbcore+share</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>ofbcore+entity</id> - <version>2.1.1-atlassian-01042004</version> - </dependency> - - <dependency> - <id>ofbcore+service</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>ofbcore+extutil</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>csv</id> - <version>20</version> - </dependency> - - <!-- A subset of Xerces including just the serializer --> - <dependency> - <id>ofbcore+xerces</id> - <version>serializer</version> - <jar>ofbcore-xerces-serialize.jar</jar> - </dependency> - - <dependency> - <id>quartz</id> - <version>1.0.7</version> - </dependency> - - <dependency> - <id>picocontainer</id> - <version>1.0</version> - </dependency> - - <!-- Version Control Integration dependencies --> - <dependency> - <!-- needed by jsch for compression --> - <!-- http://www.jcraft.com/jzlib/ --> - <id>jzlib</id> - <version>1.0.5</version> - </dependency> - - <dependency> - <!-- needed by javacvs for providing ext (ssh) CVS access method --> - <!-- http://www.jcraft.com/jsch/ --> - <id>jsch</id> - <version>0.1.16-20040721-patched</version> - </dependency> - - <dependency> - <id>javacvs</id> - <version>20040721-patched</version> - <!-- netbeans cvslib from Netbeans patched by Atlassian - (http://javacvs.netbeans.org/servlets/ProjectDownloadList) - (http://www.netbeans.org/community/sources/cvs.html) --> - </dependency> - - <dependency> - <id>statcvs</id> - <version>20040721-patched</version> - <!-- CVS HEAD --> - </dependency> - - <!-- Application Server (Jetty, Tomcat and Resin) Standalone Dependencies --> - <!-- - <dependency> - <id>castor</id> - <version>0.9.3</version> - - </dependency> - --> - <dependency> - <id>commons-dbcp</id> - <version>1.1</version> - </dependency> - - <dependency> - <id>commons-pool</id> - <version>1.1</version> - </dependency> - - <dependency> - <id>hsqldb</id> - <version>1.7.1-patched</version> - </dependency> - - <dependency> - <id>jndi</id> - <version>1.2.1</version> - </dependency> - - <dependency> - <id>jta</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>ots-jts</id> - <version>1.0</version> - <jar>ots-jts_1.0.jar</jar> - </dependency> - - <!-- Jars for DataSource and TransactionManager providers --> - <dependency> - <id>jotm</id> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>jotm+jrmp_stubs</id> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>jotm+iiop_stubs</id> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>jotm+jonas_timer</id> - <version>1.4.3</version> - <jar>jonas_timer-1.4.3.jar</jar> - </dependency> - - <dependency> - <id>jotm+objectweb-datasource</id> - <jar>objectweb-datasource-1.4.3.jar</jar> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>carol</id> - <version>1.5.2</version> - </dependency> - - <dependency> - <id>carol+properties</id> - <jar>carol-properties.jar</jar> - </dependency> - - <dependency> - <id>xapool</id> - <version>1.3.1</version> - </dependency> - - <dependency> - <id>xerces</id> - <version>1.4.4</version> - </dependency> - - <dependency> - <id>commons-jelly</id> - <version>20030310.073407</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-junit</id> - <version>20030211.141731</version> </dependency> - - <dependency> - <id>commons-jelly+tags-util</id> - <version>20030211.141939</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-email</id> - <version>20030211.144034</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-log</id> - <version>20030211.142821</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-http</id> - <version>20030211.143043</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-soap</id> - <version>20030211.142401</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-sql</id> - <version>20030211.144816</version> - </dependency> - - <dependency> - <id>commons-jexl</id> - <version>1.0-beta-2</version> - </dependency> - - <dependency> - <id>dom4j</id> - <version>1.4</version> - </dependency> - - <dependency> - <id>atlassian-trackback</id> - <version>0.7.3</version> - </dependency> - - <dependency> - <id>commons-httpclient</id> - <version>2.0-beta2</version> - </dependency> - - <!-- XML-RPC --> - <dependency> - <id>xmlrpc</id> - <version>1.2-b1</version> - </dependency> - - </dependencies> - - <reports> - <report>maven-pmd-plugin</report> - <report>maven-simian-plugin</report> - <report>maven-junit-report-plugin</report> - <report>maven-clover-plugin</report> - </reports> - - <build> - <sourceDirectory>src/java</sourceDirectory> - <resources> - <resource> - <directory>src/etc/</directory> - <include>atlassian-plugin.xml</include> - <include>**/*.vm</include> - </resource> - </resources> - </build> -</project> Modified: qa/forge/jira-extensions/developersinvolvement-report/project.xml =================================================================== --- qa/forge/jira-extensions/developersinvolvement-report/project.xml 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/developersinvolvement-report/project.xml 2005-08-09 22:03:03 UTC (rev 799) @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='ISO-8859-1'?> <project> <pomVersion>3</pomVersion> - <extend>common.xml</extend> + <extend>../common.xml</extend> <id>plugin-report-developersinvolvement</id> <name>Developers Involvement Report</name> <currentVersion>1.0</currentVersion> Modified: qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java =================================================================== --- qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-09 22:03:03 UTC (rev 799) @@ -238,6 +238,7 @@ Object project = ((GenericValue)issueList.get(i)).get("project"); + if ((((GenericValue)issueList.get(i)).get("assignee")) == null) continue; String user = (((GenericValue)issueList.get(i)).get("assignee")).toString(); Vector assignChanges = new Vector(); Deleted: qa/forge/jira-extensions/developersperproject-report/common.xml =================================================================== --- qa/forge/jira-extensions/developersperproject-report/common.xml 2005-08-09 21:18:14 UTC (rev 798) +++ qa/forge/jira-extensions/developersperproject-report/common.xml 2005-08-09 22:03:03 UTC (rev 799) @@ -1,492 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> -<project> - <pomVersion>3</pomVersion> - - - <dependencies> - <dependency> - <id>global-reports-plugins</id> - <version>1.0</version> - </dependency> - - <dependency> - <id>atlassian-jira</id> - <version>3.0</version> - </dependency> - - <dependency> - <id>atlassian-core</id> - <version>2.2</version> - </dependency> - - <dependency> - <id>atlassian-ofbiz</id> - <version>0.1.8</version> - </dependency> - - <dependency> - <id>atlassian-profiling</id> - <version>1.1.1</version> - </dependency> - - <dependency> - <id>atlassian-configurableobjects</id> - <version>0.4.5</version> - </dependency> - - <dependency> - <id>atlassian-mail</id> - <version>1.2.13</version> - </dependency> - - <dependency> - <id>atlassian-scheduler</id> - <version>0.6.6</version> - </dependency> - - <dependency> - <id>atlassian-velocity</id> - <version>0.1.8</version> - </dependency> - - <dependency> - <id>atlassian-johnson</id> - <version>0.5</version> - </dependency> - - <dependency> - <id>atlassian-plugins</id> - <version>0.2.7</version> - </dependency> - - <dependency> - <id>seraph</id> - <version>0.7.5</version> - </dependency> - - <!-- Atlassian jar dependencies --> - <dependency> - <id>atlassian-jira-extras</id> - <version>0.5.2</version> - </dependency> - - <dependency> - <id>atlassian-tagutil</id> - <version>0.1</version> - </dependency> - - <!-- OS dependencies --> - <dependency> - <id>oscache</id> - <version>DEV</version> - </dependency> - - <dependency> - <id>osworkflow</id> - <version>17Aug2004</version> - </dependency> - - <dependency> - <id>oscore</id> - <version>2.2.4</version> - </dependency> - - <dependency> - <id>osuser</id> - <version>1.0-dev-28Jul04</version> - </dependency> - - <dependency> - <id>propertyset</id> - <version>1.3</version> - </dependency> - - <dependency> - <id>sitemesh</id> - <version>2.1</version> - </dependency> - - <dependency> - <id>webwork</id> - <version>1.4</version> - </dependency> - - <dependency> - <id>webwork+pell</id> - <version>multipartrequest1.30rc1</version> - </dependency> - - <!-- Jakarta dependencies --> - <dependency> - <id>commons-digester</id> - <version>1.4.1</version> - </dependency> - - <dependency> - <id>commons-beanutils</id> - <version>1.6.1</version> - </dependency> - - <dependency> - <id>commons-logging</id> - <version>1.0.3</version> - </dependency> - - <dependency> - <id>commons-collections</id> - <version>2.1</version> - </dependency> - - <dependency> - <id>commons-lang</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>log4j</id> - <version>1.2.7</version> - <url>http://jakarta.apache.org/log4j</url> - </dependency> - - <dependency> - <id>lucene</id> - <version>1.4-final</version> - </dependency> - - <dependency> - <id>oro</id> - <version>2.0.7</version> - </dependency> - - <dependency> - <id>velocity</id> - <version>1.4</version> - </dependency> - - <!-- Testing / Mock dependencies --> - <dependency> - <id>alt</id> - <version>0.07-jdk1.3</version> - </dependency> - - <dependency> - <id>alt+j2ee</id> - <version>0.07-jdk1.3</version> - <jar>alt-0.07-j1.3-j2ee1.3.jar</jar> - </dependency> - - <dependency> - <id>junit</id> - <version>3.8.1</version> </dependency> - - <dependency> - <id>mockobjects</id> - <version>DEV</version> - </dependency> - - <dependency> - <id>easymock</id> - <groupId>easymock</groupId> - <version>1.1</version> - </dependency> - - <dependency> - <id>cglib-full</id> - <groupId>cglib</groupId> - <artifactId>cglib-full</artifactId> - <version>2.0.1</version> - </dependency> - - <dependency> - <id>easymockextension</id> - <groupId>easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <id>mockobjects+j2ee</id> - <version>0.07-jdk1.3</version> - <jar>mockobjects-0.07-j1.3-j2ee1.3.jar</jar> - </dependency> - - <dependency> - <id>mockobjects+jdk</id> - <version>0.07-jdk1.3</version> - <jar>mockobjects-0.07-jdk1.3.jar</jar> - </dependency> - - <!-- javax dependencies --> - <dependency> - <id>activation</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>javamail</id> - <version>1.2</version> - </dependency> - - <dependency> - <id>servletapi</id> - <version>2.3</version> </dependency> - - <!-- Misc dependencies --> - <dependency> - <id>glue</id> - <version>5.0b2</version> - </dependency> - - <dependency> - <id>bsf</id> - <version>2.2</version> - </dependency> - - <dependency> - <id>bsh</id> - <version>1.2b7</version> - </dependency> - - <dependency> - <id>ofbcore+share</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>ofbcore+entity</id> - <version>2.1.1-atlassian-01042004</version> - </dependency> - - <dependency> - <id>ofbcore+service</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>ofbcore+extutil</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>csv</id> - <version>20</version> - </dependency> - - <!-- A subset of Xerces including just the serializer --> - <dependency> - <id>ofbcore+xerces</id> - <version>serializer</version> - <jar>ofbcore-xerces-serialize.jar</jar> - </dependency> - - <dependency> - <id>quartz</id> - <version>1.0.7</version> - </dependency> - - <dependency> - <id>picocontainer</id> - <version>1.0</version> - </dependency> - - <!-- Version Control Integration dependencies --> - <dependency> - <!-- needed by jsch for compression --> - <!-- http://www.jcraft.com/jzlib/ --> - <id>jzlib</id> - <version>1.0.5</version> - </dependency> - - <dependency> - <!-- needed by javacvs for providing ext (ssh) CVS access method --> - <!-- http://www.jcraft.com/jsch/ --> - <id>jsch</id> - <version>0.1.16-20040721-patched</version> - </dependency> - - <dependency> - <id>javacvs</id> - <version>20040721-patched</version> - <!-- netbeans cvslib from Netbeans patched by Atlassian - (http://javacvs.netbeans.org/servlets/ProjectDownloadList) - (http://www.netbeans.org/community/sources/cvs.html) --> - </dependency> - - <dependency> - <id>statcvs</id> - <version>20040721-patched</version> - <!-- CVS HEAD --> - </dependency> - - <!-- Application Server (Jetty, Tomcat and Resin) Standalone Dependencies --> - <!-- - <dependency> - <id>castor</id> - <version>0.9.3</version> - - </dependency> - --> - <dependency> - <id>commons-dbcp</id> - <version>1.1</version> - </dependency> - - <dependency> - <id>commons-pool</id> - <version>1.1</version> - </dependency> - - <dependency> - <id>hsqldb</id> - <version>1.7.1-patched</version> - </dependency> - - <dependency> - <id>jndi</id> - <version>1.2.1</version> - </dependency> - - <dependency> - <id>jta</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>ots-jts</id> - <version>1.0</version> - <jar>ots-jts_1.0.jar</jar> - </dependency> - - <!-- Jars for DataSource and TransactionManager providers --> - <dependency> - <id>jotm</id> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>jotm+jrmp_stubs</id> - <version>1.4.3</version> - </dependency> - - <de... [truncated message content] |
Author: adamw Date: 2005-08-09 16:51:47 -0400 (Tue, 09 Aug 2005) New Revision: 796 Modified: trunk/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm trunk/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm trunk/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties Log: Final fixes Modified: trunk/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm =================================================================== --- trunk/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm 2005-08-09 20:39:09 UTC (rev 795) +++ trunk/forge/jira-extensions/developer-issues-report/src/etc/templates/developerissuesreport/developerissues-report.vm 2005-08-09 20:51:47 UTC (rev 796) @@ -15,7 +15,7 @@ <td bgcolor="fffff0"><h3 class="formtitle">$user</h3></td> <td> <table border="0" cellspacing="0" cellpadding="0"><tr><td width="$widths.get($user)" bgcolor="red"> - <img src="/images/border/spacer.gif" height=15 width="$widths.get($user)" title="$user" border="0"> + <!--<img src="/images/border/spacer.gif" height=15 width="$widths.get($user)" title="$user" border="0">--> </td></tr></table> </td> <td><h3 class="formtitle">$usersIssues.get($user)</h3></td> 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-09 20:39:09 UTC (rev 795) +++ trunk/forge/jira-extensions/issuesclosed-report/src/etc/templates/issuesclosedreport/issuesclosed-report.vm 2005-08-09 20:51:47 UTC (rev 796) @@ -26,7 +26,7 @@ <table border="0" cellpadding="0" cellspacing="0" width="$width"> <tr> <td bgcolor="#3c78b5"> - <img src="/images/border/spacer.gif" height="10" width="$width" title="$pNames.get($key)" border="0"> + <!-- <img src="/images/border/spacer.gif" height="10" width="$width" title="$pNames.get($key)" border="0">--> </td> </tr> </table> Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties =================================================================== --- trunk/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties 2005-08-09 20:39:09 UTC (rev 795) +++ trunk/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties 2005-08-09 20:51:47 UTC (rev 796) @@ -1,8 +1,13 @@ # Name of the host on which jira is running (URL of the JIRA main page) host=http://localhost:8080/jira # Login and password of JIRA administrator -adminLogin=adamw -adminPassword=adamw +#adminLogin=adamw +#adminPassword=adamw # Login and password of a JIRA user (must be in jira-developers group) -userLogin=user1 -userPassword=user1 \ No newline at end of file +#userLogin=user1 +#userPassword=user1 +adminLogin=00testuser1 +adminPassword=00TesTUseR1 +# Login and password of a JIRA user (must be in jira-developers group) +userLogin=00testuser2 +userPassword=00TesTUseR2 \ No newline at end of file |
From: <jbo...@li...> - 2005-08-09 21:36:58
|
Author: szimano Date: 2005-08-09 17:18:14 -0400 (Tue, 09 Aug 2005) New Revision: 798 Added: trunk/forge/portal-extensions/forge-wiki/docs/.classpath trunk/forge/portal-extensions/forge-wiki/docs/.project trunk/forge/portal-extensions/forge-wiki/docs/ClassDiagram.png trunk/forge/portal-extensions/forge-wiki/docs/POSTSAVEdiagram.png trunk/forge/portal-extensions/forge-wiki/docs/UseCasediagram_1.png trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.0 trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.1 trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.2 trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.3 trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.4 trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/HashMap.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Media.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaInternalization.java trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/My.uml2 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/WikiPagesHolder.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/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/plugins/ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/taglib/ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld Modified: trunk/forge/portal-extensions/forge-wiki/maven.xml trunk/forge/portal-extensions/forge-wiki/project.xml trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java Log: new wiki basics :-) Added: trunk/forge/portal-extensions/forge-wiki/docs/.classpath =================================================================== --- trunk/forge/portal-extensions/forge-wiki/docs/.classpath 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/docs/.classpath 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path=""/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/forge/portal-extensions/forge-wiki/docs/.project =================================================================== --- trunk/forge/portal-extensions/forge-wiki/docs/.project 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/docs/.project 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>forge-wiki</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/forge/portal-extensions/forge-wiki/docs/ClassDiagram.png =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/docs/ClassDiagram.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/docs/POSTSAVEdiagram.png =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/docs/POSTSAVEdiagram.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/docs/UseCasediagram_1.png =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/docs/UseCasediagram_1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.0 =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.0 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.1 =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.1 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.2 =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.2 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.3 =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.3 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.4 =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/forge-wiki/docs/wiki_diagrams.zuml.bak.4 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/forge/portal-extensions/forge-wiki/maven.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/maven.xml 2005-08-09 21:18:14 UTC (rev 798) @@ -10,10 +10,10 @@ </goal> <goal name="deploy"> -<!-- <ant:copy todir="${local.deploy.dir}" flatten="true"> + <ant:copy todir="${local.deploy.dir}" flatten="true"> <ant:fileset dir="."> <ant:filename name="target/*.war" /> </ant:fileset> - </ant:copy>--> + </ant:copy> </goal> </project> Modified: trunk/forge/portal-extensions/forge-wiki/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-09 21:18:14 UTC (rev 798) @@ -15,4 +15,18 @@ <url>http://mamut.net.pl</url> </organization> <description></description> + + <dependency> + <groupId>aslibs</groupId> + <artifactId>javax.servlet</artifactId> + <version>1.0</version> + <jar>javax.servlet.jar</jar> + </dependency> + + <dependency> + <groupId>aslibs</groupId> + <artifactId>javax.servlet.jsp</artifactId> + <version>1.0</version> + <jar>javax.servlet.jsp.jar</jar> + </dependency> </project> Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Credentials.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,8 @@ + package org.jboss.wiki; + +/** + * <p></p> + * + */ +public class Credentials { + } Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,54 @@ + package org.jboss.wiki; + +/** + * <p></p> + * + */ +public class FileDataSource implements MediaDataSource { + +/** + * <p>Represents ...</p> + * + */ + private String pathToMedia; + +public boolean preSave() { + // TODO Auto-generated method stub + return false; +} + +public boolean savePage(WikiPage page, String languageCode) { + // TODO Auto-generated method stub + return false; +} + +public boolean postSave() { + // TODO Auto-generated method stub + return false; +} + +public boolean preGet() { + // TODO Auto-generated method stub + return false; +} + +public boolean getPage(String pageName) { + // TODO Auto-generated method stub + return false; +} + +public boolean postGet() { + // TODO Auto-generated method stub + return false; +} + +public boolean getPage(String pageName, String languageCode) { + // TODO Auto-generated method stub + return false; +} + +public boolean save(Media media) { + // TODO Auto-generated method stub + return false; +} + } Added: 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/HashMap.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,8 @@ + package org.jboss.wiki; + +/** + * <p></p> + * + */ +public class HashMap { + } Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Media.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Media.java 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/Media.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,5 @@ +package org.jboss.wiki; + +public class Media { + +} Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,72 @@ + package org.jboss.wiki; +/** + * <p></p> + * + */ +public interface MediaDataSource { +/** + * <p>Does ...</p> + * + * + * @return + */ + public boolean preSave(); +/** + * <p>Does ...</p> + * + * + * @return + * @param media + */ + public boolean save(Media media); +/** + * <p>Does ...</p> + * + * + * @param page + * @return + * @param languageCode + */ + public boolean savePage(WikiPage page, String languageCode); +/** + * <p>Does ...</p> + * + * MediaDataSource definition is in Flux. + * + * @return + */ + public boolean postSave(); +/** + * <p>Does ...</p> + * + * + * @return + */ + public boolean preGet(); +/** + * <p>Does ...</p> + * + * + * @return + * @param pageName + */ + public boolean getPage(String pageName); +/** + * <p>Does ...</p> + * + * + * @return + */ + public boolean postGet(); +/** + * <p>Does ...</p> + * + * + * @param pageName + * @return + * @param languageCode + */ + public boolean getPage(String pageName, String languageCode); +} + + Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaInternalization.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaInternalization.java 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaInternalization.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,29 @@ + package org.jboss.wiki; + +import java.util.Set; + +/** + * <p></p> + * + */ +public interface MediaInternalization { +/** + * <p>Does ...</p> + * + * + * @return + * @param pageName + * @param languageCode + */ + public WikiPage getPage(String pageName, String languageCode); +/** + * <p>Does ...</p> + * + * + * @return + * @param pageName + */ + public Set getLanguageCodes(String pageName); +} + + Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/My.uml2 =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/My.uml2 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/My.uml2 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<uml:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uml="http://www.eclipse.org/uml2/1.0.0/UML" xmi:id="_9z2dYP1YEdmjPcf-8KGMfA"/> Added: 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/PluginDescriptor.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,46 @@ + package org.jboss.wiki; + +/** + * <p></p> + * + */ +public class PluginDescriptor { + +/** + * <p>Does ...</p> + * + * + * @return + */ + public String getThemeJSP() { + // your code here + return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + */ + public WikiPage getDefaultDataObject() { + // your code here + return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + */ + public void refreshPlugins() { + // your code here + + } +/** + * <p></p> + * + */ + public WikiPlugin wikiPlugin; + } Added: 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,27 @@ + package org.jboss.wiki; + +import org.jboss.portal.core.model.User; + +/** + * <p></p> + * + */ +public class WikiContext { + +/** + * <p>Represents ...</p> + * + */ + private User user; + +/** + * <p>Represents ...</p> + * + */ + private WikiType requestedType; +/** + * <p></p> + * + */ + public WikiType wikiType; + } Added: 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,209 @@ + package org.jboss.wiki; + +import java.util.Map; + +/** + * <p></p> + * + * getLink - gets a link to a given page + * getEditLink - same but link to edit that page + * save - saves page with given attributes + * getContent - retrieves the content from a wiki page and returns it in the type specified by 'type' + * Probably need to have some sort of WikiSession per request with an associated WikiContext, but maybe not--don't want to duplicate PortletSession + */ +public class WikiEngine { + +/** + * <p>Represents ...</p> + * + */ + private String urlBase; + +/** + * <p>Represents ...</p> + * + */ + private Map wikiTypes; + +/** + * <p>Represents ...</p> + * + */ + private Map wikiTypePlugins; +/** + * <p></p> + * + */ + private WikiPagesHolder pages; +/** + * <p></p> + * + */ + public WikiPage wikiPage; +/** + * <p></p> + * + * + * @poseidon-type WikiPage + */ + public java.util.Collection wikiPage_1 = new java.util.TreeSet(); + +/** + * <p>Does ...</p> + * + * + * @param pageName + * @return + * @param wikiContext + */ + public String get(String pageName, WikiContext wikiContext) { + // your code here + return null; + } + +/** + * <p>Does ...</p> + * + * + * @param pageName + * @param content + * @param wikiContext + * @return + */ + public boolean save(String pageName, String content, WikiContext wikiContext) { + // your code here + return false; + } + +/** + * <p>Does ...</p> + * + * + * @param pageName + * @param type + * @return + */ + public String getContent(String pageName, String type) { + // your code here + return null; + } + +/** + * <p>Does ...</p> + * + * + * @param pageName + * @return + * @param wikiContext + */ + public WikiPage getByName(String pageName, WikiContext wikiContext) { + // your code here + return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + */ + public void init() { + readPlugins(); + } + +/** + * <p>Does ...</p> + * + * + * @return + */ + protected void loadWikiTypes() { + // your code here + //return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + */ + protected void loadWikiTypePlugins() { + // your code here + //return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + * @param pageName + * @param wikiContext + */ + public void lock(String pageName, WikiContext wikiContext) { + // your code here + //return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + * @param pageName + * @param wikiContext + */ + public void unlock(String pageName, WikiContext wikiContext) { + // your code here + //return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + * @param path + * @param wikiContext + */ + public void getByPath(String path, WikiContext wikiContext) { + // your code here + //return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + * @param pageName + * @param wikiContext + */ + public void setProperty(String pageName, WikiContext wikiContext) { + // your code here + //return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + * @param wikiType + * @param userCredentials + */ + public void getWikiContext(String wikiType, Credentials userCredentials) { + // your code here + //return null; + } + + public void readPlugins() { + + } +/** + * <p></p> + * + */ + public WikiPortlet wikiPortlet; + } Added: 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPage.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,210 @@ + package org.jboss.wiki; + +import java.io.Serializable; + +/** + * <p></p> + * + */ +public class WikiPage implements Serializable, WikiProperties { + +/** + * + */ + private static final long serialVersionUID = 1L; + +/** + * <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 String lastAuthor; + +/** + * <p>Represents ...</p> + * + */ + private int lastVersion; + +/** + * <p>Represents ...</p> + * + */ + private java.util.Date editDate; + +/** + * <p>Represents ...</p> + * + */ + private MediaDataSource mediaDataSource; +/** + * <p></p> + * + */ + public WikiPagesHolder wikiPagesHolder; +/** + * <p></p> + * + */ + public WikiEngine wikiEngine; +/** + * <p></p> + * + */ + public WikiEngine wikiEngine_1; + +/** + * <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> + * + * + * @param pageName + * @param pageAuthor + * @param path + */ + public WikiPage(String pageName, Credentials pageAuthor, String path) { + // your code here + } + +/** + * <p>Does ...</p> + * + * + * @return + */ + public HashMap getAttributes() { + // your code here + return null; + } + +/** + * <p>Does ...</p> + * + */ + public void save() { + // your code here + } + +/** + * <p>Does ...</p> + * + * + * @return + */ + public String getPath() { + // your code here + return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + * @param mds + */ + public boolean setMediaDataSource(MediaDataSource mds) { + // your code here + return false; + } + +/** + * <p>Does ...</p> + * + * + * @param version + * @return + */ + public boolean updateToVersion(int version) { + // your code here + return false; + } + +/** + * <p>Does ...</p> + * + * + * @return + * @param version + */ + public WikiPage getPageAtVersion(int version) { + // your code here + return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + */ + public String getContent() { + // your code here + return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + */ + public MediaDataSource getMediaDataSource() { + // your code here + return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + * @param text + */ + public void setWikiText(int text) { + // your code here + //return null; + } + +/** + * <p></p> + * + */ + public MediaInternalization mediaInternalization; + } Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPagesHolder.java =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPagesHolder.java 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPagesHolder.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,52 @@ + package org.jboss.wiki; + +/** + * <p></p> + * + * pages is HashMap<String, WikiPage> + * get easly to each page by its name. + * plus basic functions for pages handling + */ +public class WikiPagesHolder { + +/** + * <p>Represents ...</p> + * + * pages is HashMap<String, WikiPage> + * get easly to each page by its name. + * plus basic functions for pages handling + */ + public HashMap pages; + +/** + * <p></p> + * + */ + public WikiEngine wikiEngine; + +/** + * <p>Does ...</p> + * + * + * @param pageName + * @param user + * @return + */ + public WikiPage getPageByName(String pageName, Credentials user) { + // your code here + return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + * @param pageName + */ + public String getHtmlText(String pageName) { + // your code here + return null; + } + + } Added: 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,34 @@ +package org.jboss.wiki; + +/** + * <p></p> + * + */ +public interface WikiPlugin { +/** + * <p></p> + * + */ + +/** + * <p>Does ...</p> + * + * + * @return + * @param content + */ + public WikiPage apply(WikiPage wikiPage); + +/** + * <p>Does ...</p> + * + * + * @return + */ + public void next(); +/** + * <p></p> + * + */ + + } Added: 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPluginChain.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,50 @@ + package org.jboss.wiki; + +import java.util.List; + +/** + * <p></p> + * + */ +public class WikiPluginChain { + +/** + * <p>Represents ...</p> + * + */ + private List pluginList; +/** + * <p></p> + * + */ + public WikiType wikiType; + +/** + * <p>Does ...</p> + * + * + * @return + * @param wikiPlugin + */ + public void addPlugin(WikiPlugin wikiPlugin) { + // your code here + //return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + * @param pluginDescriptor + */ + public void init(PluginDescriptor pluginDescriptor) { + // your code here + //return null; + } +/** + * <p></p> + * + */ + public WikiPlugin wikiPlugin; + } 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-09 21:18:14 UTC (rev 798) @@ -18,6 +18,8 @@ final static String jspPath = "/WEB-INF/jsp/"; + private String page = "Wiki.jsp"; + public void init() { } @@ -36,6 +38,13 @@ else { System.out.println("BRAK PARAMETROW!!!"); } + + if ((rReq.getParameter("action") != null)&&(rReq.getParameter("action").equals("Edit"))) { + page = "Edit.jsp"; + } + else { + page = "Wiki.jsp"; + } } public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes) throws PortletException, java.io.IOException { @@ -70,7 +79,7 @@ if(javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState()) || javax.portlet.WindowState.MAXIMIZED.equals(rReq.getWindowState())) { rRes.setContentType("text/html"); - javax.portlet.PortletRequestDispatcher pRD = this.getPortletContext().getRequestDispatcher(jspPath+"test.jsp"); + javax.portlet.PortletRequestDispatcher pRD = this.getPortletContext().getRequestDispatcher(jspPath+page); pRD.include(rReq, rRes); return; } Added: 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiProperties.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,35 @@ +package org.jboss.wiki; + + +/** + * <p></p> + * + */ +public interface WikiProperties { + +/** + * <p>Represents ...</p> + * + */ + boolean EDITABLE = false; + +/** + * <p>Represents ...</p> + * + */ + boolean PRIVATE = false; + +/** + * <p>Represents ...</p> + * + */ + boolean DELETABLE = false; + +/** + * <p>Represents ...</p> + * + */ + boolean EXISTS = false; +} + + Added: 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,65 @@ + package org.jboss.wiki; + +import java.util.List; + +/** + * <p></p> + * + */ +public class WikiType { + +/** + * <p>Represents ...</p> + * + */ + private List pluginChain; +/** + * <p></p> + * + */ + public WikiTypeDescriptor wikiTypeDescriptor; +/** + * <p></p> + * + */ + public WikiPluginChain wikiPluginChain; +/** + * <p></p> + * + */ + public WikiContext wikiContext; + +/** + * <p>Does ...</p> + * + * + * @return + */ + public void getPluginChain() { + // your code here + //return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + */ + public void initPluginChain() { + // your code here + //return null; + } + +/** + * <p>Does ...</p> + * + * + * @return + * @param content + */ + public String apply(String content) { + // your code here + return null; + } + } Added: 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeDescriptor.java 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,21 @@ + package org.jboss.wiki; + +import java.util.List; + +/** + * <p></p> + * + */ +public class WikiTypeDescriptor { + +/** + * <p>Represents ...</p> + * + */ + private List pluginNameList; +/** + * <p></p> + * + */ + public WikiType wikiType; + } Added: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,85 @@ +<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> +<%@ taglib uri="/WEB-INF/tld/portlet.tld" prefix="n" %> +<%@ taglib uri="/WEB-INF/tld/forge.tld" prefix="forge" %> +<!--<%@ taglib uri="/WEB-INF/tld/wiki.tld" prefix="wiki" %>--> +<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ page isELIgnored ="false" %> +<portlet:defineObjects/> + +<h2>JBoss Wiki: Main</h2> + +<hr /> + +<% + String actionURL = (String)request.getAttribute("actionURL"); +%> + +<form method="post" action="<%=actionURL%>"> +<textarea name="wikiContent" rows="40" cols="80" style="width:100%;"> +<H3>Welcome to JBoss Labs</H3> + +<P> +<B>JBoss Labs</B> is: +<UL> +<LI> a Professional Open Source community where Professional Open Source programmers around the world come to collaborate and create software for everyone +</LI> +<LI> the culmination of the efforts of developers (listed below as well as of all contributors to JEMS) to bring about a set of processes and infrastructure that enable the communication of ideas between the open source developers and their community. +</LI> +</UL> +<P> +<B>The Place To Be Is Our Wiki</B>: +<UL> +<LI> the place where we create and document the processes for Professional Open Source development. + +</LI> +<LI> main goal of Wiki is to provide an easy environment for POS communities to provide access to the products of their ideas. +</LI> +</UL> +<P> +JBoss is helping to nurture communication in open source communities with its JEMS offering a commitment to Professional Open Source developers around the world . +<P> +<IMG CLASS="inline" SRC="http://labs.jboss.com/file-access/default/members/default/images/LabsLayers.png" ALT="http://labs.jboss.com/file-access/default/members/default/images/LabsLayers.png" /> +<P> +JBoss Labs consists of: +<P> +<UL> +<LI> A set of <A CLASS="wikipage" HREF="Wiki.jsp?page=Processes">processes</A> that enable Professional Open Source software development. + +</LI> +<LI> An infrastructure, called <A CLASS="wikipage" HREF="Wiki.jsp?page=WhatIsJBossForge">JBoss Forge</A>, on which these processes manifest. +</LI> +<LI> A <A CLASS="wikipage" HREF="Wiki.jsp?page=JBossCommitters">community of developers</A> around the world contributing constantly. +</LI> +<LI> A <A CLASS="wikipage" HREF="Wiki.jsp?page=Projects">set of projects</A> which utilize the processes and infrustructure of JBoss Labs. + +</LI> +<LI> A Professional Open Source standard by which we measure quality and service offerings. +</LI> +<LI> And finally, a pathway for top-notch open source projects to enter the JEMS sofware suite--a symbol of Professional Open Source excellence and quality. +</LI> +</UL> +<P> +JBoss Labs' infrastructure is being developed by a community of developers from around the world. +<P> +Our developers are:<BR /> +<UL> +<LI><U>Damon Sicore</U><A HREF="Edit.jsp?page=Damon">?</A><BR /> + +</LI> +<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Rali">Rali Genova</A><BR /> +</LI> +<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Tomek">Tomek Szymański</A><BR /> +</LI> +<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Adam">Adam Warski</A><BR /> +</LI> +</UL> +<BR /> +and others... +<P> +This infrastructure is hosting several open source projects, and by the time you read this, there should be a few more. The current projects hosted on forge can be found on the <A CLASS="wikipage" HREF="Wiki.jsp?page=Projects">projects page</A>. + +</textarea> +<input type="submit" value="Save" name="editAction" /> +<input type="submit" value="Preview" name="editAction" /> +<input type="submit" value="Cancel" name="editAction" /> +</form> Added: 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-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,94 @@ +<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> +<%@ taglib uri="/WEB-INF/tld/portlet.tld" prefix="n" %> +<%@ taglib uri="/WEB-INF/tld/forge.tld" prefix="forge" %> +<!--<%@ taglib uri="/WEB-INF/tld/wiki.tld" prefix="wiki" %>--> +<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ page isELIgnored ="false" %> +<portlet:defineObjects/> + +<h2>JBoss Wiki: Main</h2> + +<h3>Page name</h3> +<div class="wikiTrail">Your trail:</div> +<hr /> + +<% + String actionURL = (String)request.getAttribute("actionURL"); +%> + +<table> +<tr> +<td class="wikiContent"> +<H3>Welcome to JBoss Labs</H3> + +<P> +<B>JBoss Labs</B> is: +<UL> +<LI> a Professional Open Source community where Professional Open Source programmers around the world come to collaborate and create software for everyone +</LI> +<LI> the culmination of the efforts of developers (listed below as well as of all contributors to JEMS) to bring about a set of processes and infrastructure that enable the communication of ideas between the open source developers and their community. +</LI> +</UL> +<P> +<B>The Place To Be Is Our Wiki</B>: +<UL> +<LI> the place where we create and document the processes for Professional Open Source development. + +</LI> +<LI> main goal of Wiki is to provide an easy environment for POS communities to provide access to the products of their ideas. +</LI> +</UL> +<P> +JBoss is helping to nurture communication in open source communities with its JEMS offering a commitment to Professional Open Source developers around the world . +<P> +<IMG CLASS="inline" SRC="http://labs.jboss.com/file-access/default/members/default/images/LabsLayers.png" ALT="http://labs.jboss.com/file-access/default/members/default/images/LabsLayers.png" /> +<P> +JBoss Labs consists of: +<P> +<UL> +<LI> A set of <A CLASS="wikipage" HREF="Wiki.jsp?page=Processes">processes</A> that enable Professional Open Source software development. + +</LI> +<LI> An infrastructure, called <A CLASS="wikipage" HREF="Wiki.jsp?page=WhatIsJBossForge">JBoss Forge</A>, on which these processes manifest. +</LI> +<LI> A <A CLASS="wikipage" HREF="Wiki.jsp?page=JBossCommitters">community of developers</A> around the world contributing constantly. +</LI> +<LI> A <A CLASS="wikipage" HREF="Wiki.jsp?page=Projects">set of projects</A> which utilize the processes and infrustructure of JBoss Labs. + +</LI> +<LI> A Professional Open Source standard by which we measure quality and service offerings. +</LI> +<LI> And finally, a pathway for top-notch open source projects to enter the JEMS sofware suite--a symbol of Professional Open Source excellence and quality. +</LI> +</UL> +<P> +JBoss Labs' infrastructure is being developed by a community of developers from around the world. +<P> +Our developers are:<BR /> +<UL> +<LI><U>Damon Sicore</U><A HREF="Edit.jsp?page=Damon">?</A><BR /> + +</LI> +<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Rali">Rali Genova</A><BR /> +</LI> +<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Tomek">Tomek Szymański</A><BR /> +</LI> +<LI><A CLASS="wikipage" HREF="Wiki.jsp?page=Adam">Adam Warski</A><BR /> +</LI> +</UL> +<BR /> +and others... +<P> +This infrastructure is hosting several open source projects, and by the time you read this, there should be a few more. The current projects hosted on forge can be found on the <A CLASS="wikipage" HREF="Wiki.jsp?page=Projects">projects page</A>. + + +<td> +</tr> +<tr> +<td class="wikiFooter"> +<hr /> +<a href="<%=actionURL%>&action=Edit">Edit this page</a> <a href="<%=actionURL%>">More info...</a> <a href="<%=actionURL%>">Attach file...</a> +</td> +</tr> +</table> + Added: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld =================================================================== --- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld 2005-08-09 20:58:21 UTC (rev 797) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/tld/wiki.tld 2005-08-09 21:18:14 UTC (rev 798) @@ -0,0 +1,25 @@ +<taglib xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd" + version="2.0"> + <!-- + JBoss, the OpenSource J2EE webOS + Distributable under LGPL license. + See terms of license at gnu.org. + --> + <tlib-version>1.1</tlib-version> + <jsp-version>2.0</jsp-version> + <shortname>forge</shortname> + <info>Forge tags</info> + + <tag> + <name>wikiEditLink</name> + <tagclass>org.jboss.wiki.taglib.wikiEditLinkTag</tagclass> + <attribute> + <name>page</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute>s + </tag> + +</taglib> |
From: <jbo...@li...> - 2005-08-09 18:14:52
|
Author: adamw Date: 2005-08-09 14:13:06 -0400 (Tue, 09 Aug 2005) New Revision: 794 Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java Log: Tests fix Modified: trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java =================================================================== --- trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-09 17:41:47 UTC (rev 793) +++ trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-09 18:13:06 UTC (rev 794) @@ -7,8 +7,6 @@ import java.io.IOException; import java.util.Properties; -import sun.security.krb5.internal.crypto.w; - import junit.framework.TestCase; import com.meterware.httpunit.*; |
Author: adamw Date: 2005-08-09 13:41:47 -0400 (Tue, 09 Aug 2005) New Revision: 793 Removed: trunk/forge/jira-extensions/developersinvolvement-report/common.xml trunk/forge/jira-extensions/developersperproject-report/common.xml trunk/forge/jira-extensions/issuesclosed-report/common.xml trunk/forge/jira-extensions/releasenotes-affect-report/common.xml Modified: trunk/forge/jira-extensions/build.properties.sample trunk/forge/jira-extensions/changelog-report/.classpath trunk/forge/jira-extensions/changelog-report/.project trunk/forge/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java trunk/forge/jira-extensions/common.xml trunk/forge/jira-extensions/developersinvolvement-report/project.xml trunk/forge/jira-extensions/developersperproject-report/project.xml trunk/forge/jira-extensions/issuesclosed-report/project.xml trunk/forge/jira-extensions/junit-tests-adamw/.classpath trunk/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/DeveloperIssuesClosedReportTest.java trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleasedProjectVersionsReportTest.java trunk/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java trunk/forge/jira-extensions/maven.xml trunk/forge/jira-extensions/releasenotes-affect-report/project.xml trunk/forge/jira-extensions/releasenotes-report/.classpath trunk/forge/jira-extensions/releasenotes-report/.project trunk/forge/jira-extensions/roadmap-report/.classpath trunk/forge/jira-extensions/roadmap-report/.project trunk/forge/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java trunk/forge/jira-extensions/voting/jira-3.2/edit-webapp/WEB-INF/classes/entitydefs/entitymodel.xml trunk/forge/jira-extensions/voting/jira-3.2/edit-webapp/secure/admin/views/voting/addvotesassigment.jsp Log: Jira fixes Modified: trunk/forge/jira-extensions/build.properties.sample =================================================================== --- trunk/forge/jira-extensions/build.properties.sample 2005-08-09 15:15:53 UTC (rev 792) +++ trunk/forge/jira-extensions/build.properties.sample 2005-08-09 17:41:47 UTC (rev 793) @@ -1,13 +1,13 @@ -# Path to the root directory of your JIRA installation +# Path to the root directory of your JIRA installation. jira.local.path= # Directory containing the web application. Should be edit-webapp for # the in-application-server version and atlassian-jira for the # standalone version. jira.web.directory= -# Your JIRA version. Supported versions: 3.0 and 3.1. -jira.version= +# Your JIRA version. Supported versions: 3.2. +jira.version=3.2 # Path where web the JIRA web application is to be deployed (only the -# application server version). +# application server version, should end with /deploy). appserv.local.path= # Path to your local maven repository. -maven.repo.local= +#maven.repo.local= Modified: trunk/forge/jira-extensions/changelog-report/.classpath =================================================================== --- trunk/forge/jira-extensions/changelog-report/.classpath 2005-08-09 15:15:53 UTC (rev 792) +++ trunk/forge/jira-extensions/changelog-report/.classpath 2005-08-09 17:41:47 UTC (rev 793) @@ -1,352 +1,182 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <classpathentry kind="src" path="src/java"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira/jars/atlassian-jira-3.0.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-core/jars/atlassian-core-2.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-ofbiz/jars/atlassian-ofbiz-0.1.8.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-profiling/jars/atlassian-profiling-1.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-configurableobjects/jars/atlassian-configurableobjects-0.4.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-mail/jars/atlassian-mail-1.2.13.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-scheduler/jars/atlassian-scheduler-0.6.6.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-velocity/jars/atlassian-velocity-0.1.8.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-johnson/jars/atlassian-johnson-0.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-plugins/jars/atlassian-plugins-0.2.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/seraph/jars/seraph-0.7.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira-extras/jars/atlassian-jira-extras-0.5.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-tagutil/jars/atlassian-tagutil-0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/oscache/jars/oscache-DEV.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/osworkflow/jars/osworkflow-17Aug2004.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/oscore/jars/oscore-2.2.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/osuser/jars/osuser-1.0-dev-28Jul04.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/propertyset/jars/propertyset-1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/sitemesh/jars/sitemesh-2.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-1.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-pell-multipartrequest1.30rc1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-digester/jars/commons-digester-1.4.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-2.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-1.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/lucene/jars/lucene-1.4-final.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-jdk1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-j1.3-j2ee1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-DEV.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymock-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymockclassextension-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-j1.3-j2ee1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-jdk1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/activation/jars/activation-1.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/javamail/jars/javamail-1.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/glue/jars/glue-5.0b2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/bsf/jars/bsf-2.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/bsh/jars/bsh-1.2b7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-share-2.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-entity-2.1.1-atlassian-01042004.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-service-2.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-extutil-2.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/csv/jars/csv-20.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-xerces-serialize.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/quartz/jars/quartz-1.0.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/picocontainer/jars/picocontainer-1.0.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jzlib/jars/jzlib-1.0.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jsch/jars/jsch-0.1.16-20040721-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/javacvs/jars/javacvs-20040721-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/statcvs/jars/statcvs-20040721-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.1-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jndi/jars/jndi-1.2.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jta/jars/jta-1.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ots-jts/jars/ots-jts_1.0.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-jrmp_stubs-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-iiop_stubs-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jonas_timer-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/objectweb-datasource-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-1.5.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-properties.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/xapool/jars/xapool-1.3.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xerces-1.4.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-20030310.073407.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-junit-20030211.141731.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-util-20030211.141939.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-email-20030211.144034.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-log-20030211.142821.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-http-20030211.143043.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-soap-20030211.142401.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-sql-20030211.144816.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jexl/jars/commons-jexl-1.0-beta-2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-trackback/jars/atlassian-trackback-0.7.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0-beta2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/xmlrpc/jars/xmlrpc-1.2-b1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.4.2"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry excluding="" kind="src" path="src/java"> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira/jars/atlassian-jira-3.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/global-reports-plugins/jars/global-reports-plugins-1.0.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-core/jars/atlassian-core-2.3.9.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-ofbiz/jars/atlassian-ofbiz-0.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-profiling/jars/atlassian-profiling-1.1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-configurableobjects/jars/atlassian-configurableobjects-0.4.11.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-mail/jars/atlassian-mail-1.2.30.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-scheduler/jars/atlassian-scheduler-0.6.6.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-velocity/jars/atlassian-velocity-0.3.9.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-johnson/jars/atlassian-johnson-0.5.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-plugins/jars/atlassian-plugins-0.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/seraph/jars/seraph-0.7.5.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira-extras/jars/atlassian-jira-extras-0.5.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-tagutil/jars/atlassian-tagutil-0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/oscache/jars/oscache-DEV.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/osworkflow/jars/osworkflow-17Aug2004.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/oscore/jars/oscore-2.2.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/osuser/jars/osuser-1.0-dev-28Jul04.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/propertyset/jars/propertyset-1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/sitemesh/jars/sitemesh-2.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-pell-multipartrequest1.30rc1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-digester/jars/commons-digester-1.4.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-2.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-1.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/lucene/jars/lucene-1.4-final.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-jdk1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-j1.3-j2ee1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-DEV.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymock-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymockclassextension-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-j1.3-j2ee1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-jdk1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/activation/jars/activation-1.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/javamail/jars/javamail-1.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/glue/jars/glue-5.0b2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/bsf/jars/bsf-2.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/bsh/jars/bsh-1.2b7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-share-2.1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-entity-2.1.1-atlassian-01042004.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-service-2.1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-extutil-2.1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/csv/jars/csv-20.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-xerces-serialize.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/quartz/jars/quartz-1.0.7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/picocontainer/jars/picocontainer-1.0.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jzlib/jars/jzlib-1.0.5.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jsch/jars/jsch-0.1.16-20040721-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/javacvs/jars/javacvs-20040721-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/statcvs/jars/statcvs-20040721-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.1-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jndi/jars/jndi-1.2.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jta/jars/jta-1.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ots-jts/jars/ots-jts_1.0.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-jrmp_stubs-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-iiop_stubs-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jonas_timer-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/objectweb-datasource-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-1.5.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-properties.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/xapool/jars/xapool-1.3.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xerces-1.4.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-20030310.073407.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-junit-20030211.141731.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-util-20030211.141939.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-email-20030211.144034.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-log-20030211.142821.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-http-20030211.143043.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-soap-20030211.142401.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-sql-20030211.144816.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jexl/jars/commons-jexl-1.0-beta-2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-trackback/jars/atlassian-trackback-0.7.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0-beta2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/xmlrpc/jars/xmlrpc-1.2-b1.jar"> + </classpathentry> + <classpathentry kind="output" path="target/classes"> + </classpathentry> +</classpath> \ No newline at end of file Modified: trunk/forge/jira-extensions/changelog-report/.project =================================================================== --- trunk/forge/jira-extensions/changelog-report/.project 2005-08-09 15:15:53 UTC (rev 792) +++ trunk/forge/jira-extensions/changelog-report/.project 2005-08-09 17:41:47 UTC (rev 793) @@ -1,27 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> - <name>Release Notes Reports</name> - <comment>An extended release notes plugin.</comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/Maven.launch</value> - </dictionary> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> + <name>plugin-globalreport-changelog</name> + <comment>A changelog global report plugin.</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Modified: trunk/forge/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java =================================================================== --- trunk/forge/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-09 15:15:53 UTC (rev 792) +++ trunk/forge/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-09 17:41:47 UTC (rev 793) @@ -27,6 +27,7 @@ import com.atlassian.jira.web.util.OutlookDateManager; import com.opensymphony.user.User; +import java.sql.Timestamp; import java.text.DateFormat; import java.util.*; @@ -225,10 +226,15 @@ { Version version = (Version) iter.next(); + Timestamp beginTs = new Timestamp(beginDate.getTime()); + Timestamp endTs = new Timestamp(endDate.getTime()); + /* Checking if the version is released in the specified period */ if ((version.isReleased()) && (version.getReleaseDate() != null) - && (version.getReleaseDate().compareTo(beginDate) >= 0) - && (version.getReleaseDate().compareTo(endDate) <= 0)) + && (version.getReleaseDate().compareTo(beginTs) + >= 0) + && (version.getReleaseDate().compareTo(endTs) + <= 0)) { Collection versionsCol = new ArrayList(); versionsCol.add(version.getId()); Modified: trunk/forge/jira-extensions/common.xml =================================================================== --- trunk/forge/jira-extensions/common.xml 2005-08-09 15:15:53 UTC (rev 792) +++ trunk/forge/jira-extensions/common.xml 2005-08-09 17:41:47 UTC (rev 793) @@ -6,7 +6,7 @@ <dependencies> <dependency> <id>atlassian-jira</id> - <version>3.0</version> + <version>3.2</version> </dependency> <dependency> @@ -16,27 +16,27 @@ <dependency> <id>atlassian-core</id> - <version>2.2</version> + <version>2.3.9</version> </dependency> <dependency> <id>atlassian-ofbiz</id> - <version>0.1.8</version> + <version>0.2</version> </dependency> <dependency> <id>atlassian-profiling</id> - <version>1.1.1</version> + <version>1.1.4</version> </dependency> <dependency> <id>atlassian-configurableobjects</id> - <version>0.4.5</version> + <version>0.4.11</version> </dependency> <dependency> <id>atlassian-mail</id> - <version>1.2.13</version> + <version>1.2.30</version> </dependency> <dependency> @@ -46,7 +46,7 @@ <dependency> <id>atlassian-velocity</id> - <version>0.1.8</version> + <version>0.3.9</version> </dependency> <dependency> @@ -56,7 +56,7 @@ <dependency> <id>atlassian-plugins</id> - <version>0.2.7</version> + <version>0.4</version> </dependency> <dependency> Deleted: trunk/forge/jira-extensions/developersinvolvement-report/common.xml =================================================================== --- trunk/forge/jira-extensions/developersinvolvement-report/common.xml 2005-08-09 15:15:53 UTC (rev 792) +++ trunk/forge/jira-extensions/developersinvolvement-report/common.xml 2005-08-09 17:41:47 UTC (rev 793) @@ -1,492 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> -<project> - <pomVersion>3</pomVersion> - - - <dependencies> - <dependency> - <id>global-reports-plugins</id> - <version>1.0</version> - </dependency> - - <dependency> - <id>atlassian-jira</id> - <version>3.0</version> - </dependency> - - <dependency> - <id>atlassian-core</id> - <version>2.2</version> - </dependency> - - <dependency> - <id>atlassian-ofbiz</id> - <version>0.1.8</version> - </dependency> - - <dependency> - <id>atlassian-profiling</id> - <version>1.1.1</version> - </dependency> - - <dependency> - <id>atlassian-configurableobjects</id> - <version>0.4.5</version> - </dependency> - - <dependency> - <id>atlassian-mail</id> - <version>1.2.13</version> - </dependency> - - <dependency> - <id>atlassian-scheduler</id> - <version>0.6.6</version> - </dependency> - - <dependency> - <id>atlassian-velocity</id> - <version>0.1.8</version> - </dependency> - - <dependency> - <id>atlassian-johnson</id> - <version>0.5</version> - </dependency> - - <dependency> - <id>atlassian-plugins</id> - <version>0.2.7</version> - </dependency> - - <dependency> - <id>seraph</id> - <version>0.7.5</version> - </dependency> - - <!-- Atlassian jar dependencies --> - <dependency> - <id>atlassian-jira-extras</id> - <version>0.5.2</version> - </dependency> - - <dependency> - <id>atlassian-tagutil</id> - <version>0.1</version> - </dependency> - - <!-- OS dependencies --> - <dependency> - <id>oscache</id> - <version>DEV</version> - </dependency> - - <dependency> - <id>osworkflow</id> - <version>17Aug2004</version> - </dependency> - - <dependency> - <id>oscore</id> - <version>2.2.4</version> - </dependency> - - <dependency> - <id>osuser</id> - <version>1.0-dev-28Jul04</version> - </dependency> - - <dependency> - <id>propertyset</id> - <version>1.3</version> - </dependency> - - <dependency> - <id>sitemesh</id> - <version>2.1</version> - </dependency> - - <dependency> - <id>webwork</id> - <version>1.4</version> - </dependency> - - <dependency> - <id>webwork+pell</id> - <version>multipartrequest1.30rc1</version> - </dependency> - - <!-- Jakarta dependencies --> - <dependency> - <id>commons-digester</id> - <version>1.4.1</version> - </dependency> - - <dependency> - <id>commons-beanutils</id> - <version>1.6.1</version> - </dependency> - - <dependency> - <id>commons-logging</id> - <version>1.0.3</version> - </dependency> - - <dependency> - <id>commons-collections</id> - <version>2.1</version> - </dependency> - - <dependency> - <id>commons-lang</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>log4j</id> - <version>1.2.7</version> - <url>http://jakarta.apache.org/log4j</url> - </dependency> - - <dependency> - <id>lucene</id> - <version>1.4-final</version> - </dependency> - - <dependency> - <id>oro</id> - <version>2.0.7</version> - </dependency> - - <dependency> - <id>velocity</id> - <version>1.4</version> - </dependency> - - <!-- Testing / Mock dependencies --> - <dependency> - <id>alt</id> - <version>0.07-jdk1.3</version> - </dependency> - - <dependency> - <id>alt+j2ee</id> - <version>0.07-jdk1.3</version> - <jar>alt-0.07-j1.3-j2ee1.3.jar</jar> - </dependency> - - <dependency> - <id>junit</id> - <version>3.8.1</version> </dependency> - - <dependency> - <id>mockobjects</id> - <version>DEV</version> - </dependency> - - <dependency> - <id>easymock</id> - <groupId>easymock</groupId> - <version>1.1</version> - </dependency> - - <dependency> - <id>cglib-full</id> - <groupId>cglib</groupId> - <artifactId>cglib-full</artifactId> - <version>2.0.1</version> - </dependency> - - <dependency> - <id>easymockextension</id> - <groupId>easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <id>mockobjects+j2ee</id> - <version>0.07-jdk1.3</version> - <jar>mockobjects-0.07-j1.3-j2ee1.3.jar</jar> - </dependency> - - <dependency> - <id>mockobjects+jdk</id> - <version>0.07-jdk1.3</version> - <jar>mockobjects-0.07-jdk1.3.jar</jar> - </dependency> - - <!-- javax dependencies --> - <dependency> - <id>activation</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>javamail</id> - <version>1.2</version> - </dependency> - - <dependency> - <id>servletapi</id> - <version>2.3</version> </dependency> - - <!-- Misc dependencies --> - <dependency> - <id>glue</id> - <version>5.0b2</version> - </dependency> - - <dependency> - <id>bsf</id> - <version>2.2</version> - </dependency> - - <dependency> - <id>bsh</id> - <version>1.2b7</version> - </dependency> - - <dependency> - <id>ofbcore+share</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>ofbcore+entity</id> - <version>2.1.1-atlassian-01042004</version> - </dependency> - - <dependency> - <id>ofbcore+service</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>ofbcore+extutil</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>csv</id> - <version>20</version> - </dependency> - - <!-- A subset of Xerces including just the serializer --> - <dependency> - <id>ofbcore+xerces</id> - <version>serializer</version> - <jar>ofbcore-xerces-serialize.jar</jar> - </dependency> - - <dependency> - <id>quartz</id> - <version>1.0.7</version> - </dependency> - - <dependency> - <id>picocontainer</id> - <version>1.0</version> - </dependency> - - <!-- Version Control Integration dependencies --> - <dependency> - <!-- needed by jsch for compression --> - <!-- http://www.jcraft.com/jzlib/ --> - <id>jzlib</id> - <version>1.0.5</version> - </dependency> - - <dependency> - <!-- needed by javacvs for providing ext (ssh) CVS access method --> - <!-- http://www.jcraft.com/jsch/ --> - <id>jsch</id> - <version>0.1.16-20040721-patched</version> - </dependency> - - <dependency> - <id>javacvs</id> - <version>20040721-patched</version> - <!-- netbeans cvslib from Netbeans patched by Atlassian - (http://javacvs.netbeans.org/servlets/ProjectDownloadList) - (http://www.netbeans.org/community/sources/cvs.html) --> - </dependency> - - <dependency> - <id>statcvs</id> - <version>20040721-patched</version> - <!-- CVS HEAD --> - </dependency> - - <!-- Application Server (Jetty, Tomcat and Resin) Standalone Dependencies --> - <!-- - <dependency> - <id>castor</id> - <version>0.9.3</version> - - </dependency> - --> - <dependency> - <id>commons-dbcp</id> - <version>1.1</version> - </dependency> - - <dependency> - <id>commons-pool</id> - <version>1.1</version> - </dependency> - - <dependency> - <id>hsqldb</id> - <version>1.7.1-patched</version> - </dependency> - - <dependency> - <id>jndi</id> - <version>1.2.1</version> - </dependency> - - <dependency> - <id>jta</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>ots-jts</id> - <version>1.0</version> - <jar>ots-jts_1.0.jar</jar> - </dependency> - - <!-- Jars for DataSource and TransactionManager providers --> - <dependency> - <id>jotm</id> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>jotm+jrmp_stubs</id> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>jotm+iiop_stubs</id> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>jotm+jonas_timer</id> - <version>1.4.3</version> - <jar>jonas_timer-1.4.3.jar</jar> - </dependency> - - <dependency> - <id>jotm+objectweb-datasource</id> - <jar>objectweb-datasource-1.4.3.jar</jar> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>carol</id> - <version>1.5.2</version> - </dependency> - - <dependency> - <id>carol+properties</id> - <jar>carol-properties.jar</jar> - </dependency> - - <dependency> - <id>xapool</id> - <version>1.3.1</version> - </dependency> - - <dependency> - <id>xerces</id> - <version>1.4.4</version> - </dependency> - - <dependency> - <id>commons-jelly</id> - <version>20030310.073407</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-junit</id> - <version>20030211.141731</version> </dependency> - - <dependency> - <id>commons-jelly+tags-util</id> - <version>20030211.141939</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-email</id> - <version>20030211.144034</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-log</id> - <version>20030211.142821</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-http</id> - <version>20030211.143043</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-soap</id> - <version>20030211.142401</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-sql</id> - <version>20030211.144816</version> - </dependency> - - <dependency> - <id>commons-jexl</id> - <version>1.0-beta-2</version> - </dependency> - - <dependency> - <id>dom4j</id> - <version>1.4</version> - </dependency> - - <dependency> - <id>atlassian-trackback</id> - <version>0.7.3</version> - </dependency> - - <dependency> - <id>commons-httpclient</id> - <version>2.0-beta2</version> - </dependency> - - <!-- XML-RPC --> - <dependency> - <id>xmlrpc</id> - <version>1.2-b1</version> - </dependency> - - </dependencies> - - <reports> - <report>maven-pmd-plugin</report> - <report>maven-simian-plugin</report> - <report>maven-junit-report-plugin</report> - <report>maven-clover-plugin</report> - </reports> - - <build> - <sourceDirectory>src/java</sourceDirectory> - <resources> - <resource> - <directory>src/etc/</directory> - <include>atlassian-plugin.xml</include> - <include>**/*.vm</include> - </resource> - </resources> - </build> -</project> Modified: trunk/forge/jira-extensions/developersinvolvement-report/project.xml =================================================================== --- trunk/forge/jira-extensions/developersinvolvement-report/project.xml 2005-08-09 15:15:53 UTC (rev 792) +++ trunk/forge/jira-extensions/developersinvolvement-report/project.xml 2005-08-09 17:41:47 UTC (rev 793) @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='ISO-8859-1'?> <project> <pomVersion>3</pomVersion> - <extend>common.xml</extend> + <extend>../common.xml</extend> <id>plugin-report-developersinvolvement</id> <name>Developers Involvement Report</name> <currentVersion>1.0</currentVersion> Deleted: trunk/forge/jira-extensions/developersperproject-report/common.xml =================================================================== --- trunk/forge/jira-extensions/developersperproject-report/common.xml 2005-08-09 15:15:53 UTC (rev 792) +++ trunk/forge/jira-extensions/developersperproject-report/common.xml 2005-08-09 17:41:47 UTC (rev 793) @@ -1,492 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> -<project> - <pomVersion>3</pomVersion> - - - <dependencies> - <dependency> - <id>global-reports-plugins</id> - <version>1.0</version> - </dependency> - - <dependency> - <id>atlassian-jira</id> - <version>3.0</version> - </dependency> - - <dependency> - <id>atlassian-core</id> - <version>2.2</version> - </dependency> - - <dependency> - <id>atlassian-ofbiz</id> - <version>0.1.8</version> - </dependency> - - <dependency> - <id>atlassian-profiling</id> - <version>1.1.1</version> - </dependency> - - <dependency> - <id>atlassian-configurableobjects</id> - <version>0.4.5</version> - </dependency> - - <dependency> - <id>atlassian-mail</id> - <version>1.2.13</version> - </dependency> - - <dependency> - <id>atlassian-scheduler</id> - <version>0.6.6</version> - </dependency> - - <dependency> - <id>atlassian-velocity</id> - <version>0.1.8</version> - </dependency> - - <dependency> - <id>atlassian-johnson</id> - <version>0.5</version> - </dependency> - - <dependency> - <id>atlassian-plugins</id> - <version>0.2.7</version> - </dependency> - - <dependency> - <id>seraph</id> - <version>0.7.5</version> - </dependency> - - <!-- Atlassian jar dependencies --> - <dependency> - <id>atlassian-jira-extras</id> - <version>0.5.2</version> - </dependency> - - <dependency> - <id>atlassian-tagutil</id> - <version>0.1</version> - </dependency> - - <!-- OS dependencies --> - <dependency> - <id>oscache</id> - <version>DEV</version> - </dependency> - - <dependency> - <id>osworkflow</id> - <version>17Aug2004</version> - </dependency> - - <dependency> - <id>oscore</id> - <version>2.2.4</version> - </dependency> - - <dependency> - <id>osuser</id> - <version>1.0-dev-28Jul04</version> - </dependency> - - <dependency> - <id>propertyset</id> - <version>1.3</version> - </dependency> - - <dependency> - <id>sitemesh</id> - <version>2.1</version> - </dependency> - - <dependency> - <id>webwork</id> - <version>1.4</version> - </dependency> - - <dependency> - <id>webwork+pell</id> - <version>multipartrequest1.30rc1</version> - </dependency> - - <!-- Jakarta dependencies --> - <dependency> - <id>commons-digester</id> - <version>1.4.1</version> - </dependency> - - <dependency> - <id>commons-beanutils</id> - <version>1.6.1</version> - </dependency> - - <dependency> - <id>commons-logging</id> - <version>1.0.3</version> - </dependency> - - <dependency> - <id>commons-collections</id> - <version>2.1</version> - </dependency> - - <dependency> - <id>commons-lang</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>log4j</id> - <version>1.2.7</version> - <url>http://jakarta.apache.org/log4j</url> - </dependency> - - <dependency> - <id>lucene</id> - <version>1.4-final</version> - </dependency> - - <dependency> - <id>oro</id> - <version>2.0.7</version> - </dependency> - - <dependency> - <id>velocity</id> - <version>1.4</version> - </dependency> - - <!-- Testing / Mock dependencies --> - <dependency> - <id>alt</id> - <version>0.07-jdk1.3</version> - </dependency> - - <dependency> - <id>alt+j2ee</id> - <version>0.07-jdk1.3</version> - <jar>alt-0.07-j1.3-j2ee1.3.jar</jar> - </dependency> - - <dependency> - <id>junit</id> - <version>3.8.1</version> </dependency> - - <dependency> - <id>mockobjects</id> - <version>DEV</version> - </dependency> - - <dependency> - <id>easymock</id> - <groupId>easymock</groupId> - <version>1.1</version> - </dependency> - - <dependency> - <id>cglib-full</id> - <groupId>cglib</groupId> - <artifactId>cglib-full</artifactId> - <version>2.0.1</version> - </dependency> - - <dependency> - <id>easymockextension</id> - <groupId>easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <id>mockobjects+j2ee</id> - <version>0.07-jdk1.3</version> - <jar>mockobjects-0.07-j1.3-j2ee1.3.jar</jar> - </dependency> - - <dependency> - <id>mockobjects+jdk</id> - <version>0.07-jdk1.3</version> - <jar>mockobjects-0.07-jdk1.3.jar</jar> - </dependency> - - <!-- javax dependencies --> - <dependency> - <id>activation</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>javamail</id> - <version>1.2</version> - </dependency> - - <dependency> - <id>servletapi</id> - <version>2.3</version> </dependency> - - <!-- Misc dependencies --> - <dependency> - <id>glue</id> - <version>5.0b2</version> - </dependency> - - <dependency> - <id>bsf</id> - <version>2.2</version> - </dependency> - - <dependency> - <id>bsh</id> - <version>1.2b7</version> - </dependency> - - <dependency> - <id>ofbcore+share</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>ofbcore+entity</id> - <version>2.1.1-atlassian-01042004</version> - </dependency> - - <dependency> - <id>ofbcore+service</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>ofbcore+extutil</id> - <version>2.1.1</version> - </dependency> - - <dependency> - <id>csv</id> - <version>20</version> - </dependency> - - <!-- A subset of Xerces including just the serializer --> - <dependency> - <id>ofbcore+xerces</id> - <version>serializer</version> - <jar>ofbcore-xerces-serialize.jar</jar> - </dependency> - - <dependency> - <id>quartz</id> - <version>1.0.7</version> - </dependency> - - <dependency> - <id>picocontainer</id> - <version>1.0</version> - </dependency> - - <!-- Version Control Integration dependencies --> - <dependency> - <!-- needed by jsch for compression --> - <!-- http://www.jcraft.com/jzlib/ --> - <id>jzlib</id> - <version>1.0.5</version> - </dependency> - - <dependency> - <!-- needed by javacvs for providing ext (ssh) CVS access method --> - <!-- http://www.jcraft.com/jsch/ --> - <id>jsch</id> - <version>0.1.16-20040721-patched</version> - </dependency> - - <dependency> - <id>javacvs</id> - <version>20040721-patched</version> - <!-- netbeans cvslib from Netbeans patched by Atlassian - (http://javacvs.netbeans.org/servlets/ProjectDownloadList) - (http://www.netbeans.org/community/sources/cvs.html) --> - </dependency> - - <dependency> - <id>statcvs</id> - <version>20040721-patched</version> - <!-- CVS HEAD --> - </dependency> - - <!-- Application Server (Jetty, Tomcat and Resin) Standalone Dependencies --> - <!-- - <dependency> - <id>castor</id> - <version>0.9.3</version> - - </dependency> - --> - <dependency> - <id>commons-dbcp</id> - <version>1.1</version> - </dependency> - - <dependency> - <id>commons-pool</id> - <version>1.1</version> - </dependency> - - <dependency> - <id>hsqldb</id> - <version>1.7.1-patched</version> - </dependency> - - <dependency> - <id>jndi</id> - <version>1.2.1</version> - </dependency> - - <dependency> - <id>jta</id> - <version>1.0.1</version> - </dependency> - - <dependency> - <id>ots-jts</id> - <version>1.0</version> - <jar>ots-jts_1.0.jar</jar> - </dependency> - - <!-- Jars for DataSource and TransactionManager providers --> - <dependency> - <id>jotm</id> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>jotm+jrmp_stubs</id> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>jotm+iiop_stubs</id> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>jotm+jonas_timer</id> - <version>1.4.3</version> - <jar>jonas_timer-1.4.3.jar</jar> - </dependency> - - <dependency> - <id>jotm+objectweb-datasource</id> - <jar>objectweb-datasource-1.4.3.jar</jar> - <version>1.4.3</version> - </dependency> - - <dependency> - <id>carol</id> - <version>1.5.2</version> - </dependency> - - <dependency> - <id>carol+properties</id> - <jar>carol-properties.jar</jar> - </dependency> - - <dependency> - <id>xapool</id> - <version>1.3.1</version> - </dependency> - - <dependency> - <id>xerces</id> - <version>1.4.4</version> - </dependency> - - <dependency> - <id>commons-jelly</id> - <version>20030310.073407</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-junit</id> - <version>20030211.141731</version> </dependency> - - <dependency> - <id>commons-jelly+tags-util</id> - <version>20030211.141939</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-email</id> - <version>20030211.144034</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-log</id> - <version>20030211.142821</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-http</id> - <version>20030211.143043</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-soap</id> - <version>20030211.142401</version> - </dependency> - - <dependency> - <id>commons-jelly+tags-sql</id> - <version>20030211.144816</version> - </dependency> - - <dependency> - <id>commons-jexl</id> - <version>1.0-beta-2</version> - </dependency> - - <dependency> - <id>dom4j</id> - <version>1.4</version> - </dependency> - - <dependency> - <id>atlassian-trackback</id> - <version>0.7.3</version> - </dependency> - - <dependency> - <id>commons-httpclient</id> - <version>2.0-beta2</version> - </dependency> - - <!-- XML-RPC --> - <dependency> - <id>xmlrpc</id> - <version>1.2-b1</version> - </dependency> - - </dependencies> - - <reports> - <report>maven-pmd-plugin</report> - <report>maven-simian-plugin</report> - <report>maven-junit-report-plugin</report> - <report>maven-clover-plugin</report> - </reports> - - <build> - <sourceDirectory>src/java</sourceDirectory> - <resources> - <resource> - <directory>src/etc/</directory> - <include>atlassian-plugin.xml</include> - <include>**/*.vm</include> - </resource> - </resources> - </build> -</project> Modified: trunk/forge/jira-extensions/developersperproject-report/project.xml =================================================================== --- trunk/forge/jira-extensions/developersperproject-report/project.xml 2005-08-09 15:15:53 UTC (rev 792) +++ trunk/forge/jira-extensions/developersperproject-report/project.xml 2005-08-09 17:41:47 UTC (rev 793) @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='ISO-8859-1'?> <project> <pomVersion>3</pomVersion> - <extend>common.xml</extend> + <extend>../common.xml</extend> <id>plugin-report-developersperproject</id> <name>Developers per Project Report</name> <currentVersion>1.0</currentVersion> Deleted: trunk/forge/jira-extensions/issuesclosed-report/common.xml =================================================================== --- trunk/forge/jira-extensions/issuesclosed-report/common.xml 2005-08-09 15:15:53 UTC (rev 792) +++ trunk/forge/jira-extensions/issuesclosed-report/common.xml 2005-08-09 17:41:47 UTC (rev 793) @@ -1,492 +0,0 @@ -<?xml version='1.0' encoding='ISO-8859-1'?> -<project> - <pomVersion>3</pomVersion> - - - <dependencies> - <dependency> - <id>global-reports-plugins</id> - <version>1.0</version> - </dependency> - - <dependency> - <id>atlassian-jira</id> - <version>3.0</version> - </dependency> - - <dependency> - <id>atlassian-core</id> - <version>2.2</version> - </dependency> - - <dependency> - <id>atlassian-ofbiz</id> - <version>0.1.8</version> - </dependency> - - <dependency> - <id>atlassian-profiling</id> - <version>1.1.1</version> - </dependency> - - <dependency> - <id>atlassian-configurableobjects</id> - <version>0.4.5</version> - </dependency> - - <dependency> - <id>atlassian-mail</id> - <version>1.2.13</version> - </dependency> - - <dependency> - <id>atlassian-scheduler</id> - <version>0.6.6</version> - </dependency> - - <dependency> - <id>atlassian-velocity</id> - <version>0.1.8</version> - </dependency> - - <dependency> - <id>atlassian-johnson</id> - <version>0.5</version> - </dependency> - - <dependency> - <id>atlassian-plugins</id> - <version>0.2.7</version> - </dependency> - - <dependency> - <id>seraph</id> - <version>0.7.5</version> - </dependency> - - <!-- Atlassian jar dependencies --> - <dependency> - <id>atlassian-jira-extras</id> - <version>0.5.2</version> - </dependency> - - <dependency> - <id>atlassian-tagutil</id> - <version>0.1</version> - </dependency> - - <!-- OS dependencies --> - <dependency> - <id>oscache</id> - <version>DEV</version> - </dependency> - - <dependency> - <id>osworkflow</id> - <version>17Aug2004</version> - </dependency> - - <dependency> - <id>oscore</id> - <version>2.2.4</version> - </dependency> - - <dependency> - <id>osuser</id> - <ve... [truncated message content] |