Menu
▾
▴
jboss-svn-commits — JBoss SVN commit notifications
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(233) |
Sep
(199) |
Oct
(206) |
Nov
(185) |
Dec
(270) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(232) |
Feb
(426) |
Mar
(623) |
Apr
(592) |
May
(506) |
Jun
(389) |
Jul
(160) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
| 2007 |
Jan
(1) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(9) |
Nov
(6) |
Dec
(6) |
| 2008 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(5) |
Jul
(10) |
Aug
(2) |
Sep
(12) |
Oct
(10) |
Nov
(54) |
Dec
(49) |
| 2009 |
Jan
(19) |
Feb
(13) |
Mar
(20) |
Apr
(24) |
May
(44) |
Jun
(29) |
Jul
(32) |
Aug
(10) |
Sep
(7) |
Oct
(10) |
Nov
(4) |
Dec
(17) |
| 2010 |
Jan
(14) |
Feb
(5) |
Mar
(23) |
Apr
(50) |
May
(31) |
Jun
(9) |
Jul
(5) |
Aug
(4) |
Sep
(7) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(12) |
Feb
(5) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Author: dam...@jb... Date: 2005-08-27 14:37:59 -0400 (Sat, 27 Aug 2005) New Revision: 995 Added: qa/jira-extensions/jira-file-modifications/jira-3.3/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/actions.xml qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/entitydefs/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/entitydefs/entitygroup.xml qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/entitydefs/entitymodel.xml qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/votes-assigment-types.xml qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/decorators/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/decorators/admin.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/decorators/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/decorators/bodytop.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/table/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/table/header.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/panels/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/panels/project/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/panels/project/schemes.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/addscheme.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/addvotesassigment.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/deletescheme.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/deletevotesassigment.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/editscheme.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/editvotesassigments.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/viewschemes.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/views/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/views/voting/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/views/voting/selectprojectscheme.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/globalreports/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/globalreports/globalreports.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp qa/jira-extensions/multiselect/jira-3.3/ qa/jira-extensions/multiselect/jira-3.3/edit-webapp/ qa/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/ qa/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/ qa/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/atlassian-configurableobjects-0.4.11.jar Removed: qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/actions.xml qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/entitydefs/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/entitydefs/entitygroup.xml qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/entitydefs/entitymodel.xml qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/votes-assigment-types.xml qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/decorators/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/decorators/admin.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/decorators/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/decorators/bodytop.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/table/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/table/header.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/panels/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/panels/project/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/panels/project/schemes.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/addscheme.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/addvotesassigment.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/deletescheme.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/deletevotesassigment.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/editscheme.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/editvotesassigments.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/viewschemes.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/views/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/views/voting/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/views/voting/selectprojectscheme.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/globalreports/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/globalreports/globalreports.jsp qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp qa/jira-extensions/multiselect/jira-3.3/edit-webapp/ qa/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/ qa/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/ qa/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/atlassian-configurableobjects-0.4.11.jar qa/jira-extensions/voting/src/jsp/ Modified: qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml qa/jira-extensions/changelog-report/src/etc/pl/net/mamut/jira/changelog_report.properties qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java qa/jira-extensions/common.xml qa/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java qa/jira-extensions/developersinvolvement-report/src/etc/pl/net/mamut/jira/developersinvolvement/developersinvolvement_report.properties qa/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java qa/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java qa/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/navigator/rnotes.jsp qa/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java qa/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java qa/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java qa/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java qa/jira-extensions/project.xml qa/jira-extensions/releasenotes-affect-report/.classpath qa/jira-extensions/releasenotes-affect-report/.project qa/jira-extensions/releasenotes-affect-report/src/etc/atlassian-plugin.xml qa/jira-extensions/releasenotes-affect-report/src/etc/templates/releasenotes-affectreport/releasenotes-affect-html.vm qa/jira-extensions/releasenotes-affect-report/src/etc/templates/releasenotes-affectreport/releasenotes-affect-report.vm qa/jira-extensions/releasenotes-affect-report/src/etc/templates/releasenotes-affectreport/releasenotes-affect-text.vm qa/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java qa/jira-extensions/releasenotes-report/src/etc/atlassian-plugin.xml qa/jira-extensions/releasenotes-report/src/etc/pl/net/mamut/releasenotes_report.properties qa/jira-extensions/releasenotes-report/src/etc/templates/releasenotesreport/releasenotes-html.vm qa/jira-extensions/releasenotes-report/src/etc/templates/releasenotesreport/releasenotes-report.vm qa/jira-extensions/releasenotes-report/src/etc/templates/releasenotesreport/releasenotes-text.vm qa/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java qa/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml qa/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties qa/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java qa/jira-extensions/voting/.classpath qa/jira-extensions/voting/src/java/com/atlassian/jira/voting/DefaultVotingSchemeManager.java qa/jira-extensions/voting/src/java/com/atlassian/jira/voting/VotingManagerFactory.java qa/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddScheme.java qa/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddVotesAssigment.java qa/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/CopyScheme.java qa/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/DeleteScheme.java qa/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/DeleteVotesAssigment.java qa/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/EditVotesAssigments.java Log: MERGED: -r 870:993 https://svn.labs.jboss.com/trunk/jira-extensions into qa/jira-extensions for 3.3 JIRA update. Modified: qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml =================================================================== --- qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 18:32:14 UTC (rev 994) +++ qa/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 18:37:59 UTC (rev 995) @@ -1,12 +1,12 @@ <atlassian-plugin key="pl.net.mamut.jira.changelogreport" name="Released project versions report"> <plugin-info> - <description>A seleased project versions global report plugin.</description> + <description>Released project versions global report plugin.</description> <version>1.0</version> <application-version min="3.0" max="3.0"/> <vendor name="Adam Warski" url="http://mamut.net.pl/"/> </plugin-info> - <report-global key="changelog" name="Released project versions report" class="pl.net.mamut.jira.ChangelogGlobalReport"> + <report-global key="changelog" name="Project changelog report" class="pl.net.mamut.jira.ChangelogGlobalReport"> <description key="report.changelog.description">i18n description</description> <label key="report.changelog.label" /> Modified: qa/jira-extensions/changelog-report/src/etc/pl/net/mamut/jira/changelog_report.properties =================================================================== --- qa/jira-extensions/changelog-report/src/etc/pl/net/mamut/jira/changelog_report.properties 2005-08-27 18:32:14 UTC (rev 994) +++ qa/jira-extensions/changelog-report/src/etc/pl/net/mamut/jira/changelog_report.properties 2005-08-27 18:37:59 UTC (rev 995) @@ -1,5 +1,5 @@ -report.changelog.label = Released project versions report -report.changelog.name = Released project versions report +report.changelog.label = Project changelog report +report.changelog.name = Project changelog report report.changelog.description = Generates a changelog-like view of released versions of selected projects, for a given period of time, including selected issue types and priorities. report.changelog.projects.name = Projects report.changelog.projects.description = Select projects which you want to include in the report. Modified: qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java =================================================================== --- qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 18:32:14 UTC (rev 994) +++ qa/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 18:37:59 UTC (rev 995) @@ -5,7 +5,9 @@ package pl.net.mamut.jira; import com.atlassian.jira.config.ConstantsManager; +import com.atlassian.jira.config.SubTaskManager; import com.atlassian.jira.config.properties.ApplicationProperties; +import com.atlassian.jira.issue.IssueImpl; import com.atlassian.jira.issue.IssueManager; import com.atlassian.jira.issue.search.SearchException; import com.atlassian.jira.issue.search.SearchProvider; @@ -14,6 +16,7 @@ import com.atlassian.jira.issue.search.parameters.lucene.IssueTypeParameter; import com.atlassian.jira.issue.search.parameters.lucene.PriorityParameter; import com.atlassian.jira.issue.search.parameters.lucene.ProjectParameter; +import com.atlassian.jira.issue.security.IssueSecurityLevelManager; import com.atlassian.jira.plugin.globalreport.impl.AbstractGlobalReport; import com.atlassian.jira.plugin.report.ReportModuleDescriptor; import com.atlassian.jira.project.ProjectManager; @@ -32,7 +35,6 @@ import java.util.*; import org.ofbiz.core.entity.GenericValue; - /** * * @author adamw @@ -40,24 +42,30 @@ public class ChangelogGlobalReport extends AbstractGlobalReport { private final SearchProvider searchProvider; - private final IssueManager issueManager; private final ConstantsManager constantsManager; private final ApplicationProperties appProps; private final OutlookDateManager outlookDateManager; private final ProjectManager projectManager; private final VersionManager versionManager; + private final IssueManager issueManager; + private final SubTaskManager subTaskManager; + private final IssueSecurityLevelManager issueSecurityLevelManager; public ChangelogGlobalReport(OutlookDateManager outlookDateManager, ApplicationProperties appProps, - ConstantsManager constantsManager, SearchProvider searchProvider, IssueManager issueManager, - ProjectManager projectManager, VersionManager versionManager) + ConstantsManager constantsManager, SearchProvider searchProvider, + ProjectManager projectManager, VersionManager versionManager, + IssueManager issueManager, SubTaskManager subTaskManager, + IssueSecurityLevelManager issueSecurityLevelManager) { this.outlookDateManager = outlookDateManager; this.searchProvider = searchProvider; - this.issueManager = issueManager; this.constantsManager = constantsManager; this.appProps = appProps; this.projectManager = projectManager; - this.versionManager = versionManager; + this.versionManager = versionManager; + this.issueManager = issueManager; + this.subTaskManager = subTaskManager; + this.issueSecurityLevelManager = issueSecurityLevelManager; } /** @@ -79,7 +87,19 @@ sr.addParameter(new IssueTypeParameter(sections)); sr.addParameter(new PriorityParameter(priorities)); sr.addParameter(new ProjectParameter(projectId)); - return searchProvider.search(sr, remoteUser); + + // Converting the list of issues represented by generic values + // to a list of wrappers. + List gvIssues = searchProvider.search(sr, remoteUser); + List wrIssues = new ArrayList(); + + for (Iterator iter = gvIssues.iterator(); iter.hasNext();) + wrIssues.add(new IssueImpl((GenericValue) iter.next(), + issueManager, projectManager, versionManager, + issueSecurityLevelManager, constantsManager, + subTaskManager)); + + return wrIssues; } private int min(int a, int b) { if (a < b) return a; else return b; } Modified: qa/jira-extensions/common.xml =================================================================== --- qa/jira-extensions/common.xml 2005-08-27 18:32:14 UTC (rev 994) +++ qa/jira-extensions/common.xml 2005-08-27 18:37:59 UTC (rev 995) @@ -6,7 +6,7 @@ <dependencies> <dependency> <id>atlassian-jira</id> - <version>3.2</version> + <version>3.3</version> </dependency> <dependency> @@ -21,7 +21,7 @@ <dependency> <id>atlassian-ofbiz</id> - <version>0.2</version> + <version>0.2.6</version> </dependency> <dependency> @@ -41,7 +41,7 @@ <dependency> <id>atlassian-scheduler</id> - <version>0.6.6</version> + <version>0.7.9</version> </dependency> <dependency> @@ -51,7 +51,7 @@ <dependency> <id>atlassian-johnson</id> - <version>0.5</version> + <version>0.5.7</version> </dependency> <dependency> Modified: qa/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java =================================================================== --- qa/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-27 18:32:14 UTC (rev 994) +++ qa/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-27 18:37:59 UTC (rev 995) @@ -1,17 +1,12 @@ package pl.net.mamut.jira; import com.atlassian.jira.config.ConstantsManager; -import com.atlassian.jira.config.properties.ApplicationProperties; -import com.atlassian.jira.issue.IssueManager; import com.atlassian.jira.issue.search.SearchException; import com.atlassian.jira.issue.search.SearchProvider; import com.atlassian.jira.issue.search.SearchRequest; import com.atlassian.jira.issue.search.parameters.lucene.ProjectParameter; import com.atlassian.jira.issue.search.parameters.lucene.ResolutionParameter; -import com.atlassian.jira.project.ProjectManager; -import com.atlassian.jira.project.version.VersionManager; import com.atlassian.jira.issue.ActionManager; -import com.atlassian.jira.security.PermissionManager; import com.atlassian.jira.util.I18nHelper; import com.atlassian.jira.util.ParameterUtils; import com.atlassian.jira.web.action.ProjectActionSupport; @@ -26,7 +21,6 @@ import org.ofbiz.core.entity.GenericValue; import java.text.DateFormat; import com.atlassian.jira.web.action.admin.user.UserBrowser; -import com.atlassian.plugin.PluginManager; import java.util.*; @@ -36,30 +30,17 @@ */ public class DeveloperIssuesReport extends AbstractGlobalReport { private final SearchProvider searchProvider; - private final IssueManager issueManager; private final ConstantsManager constantsManager; - private final ApplicationProperties appProps; private final OutlookDateManager outlookDateManager; - private final ProjectManager projectManager; - private final VersionManager versionManager; - private final PermissionManager permissionManager; - private final PluginManager pluginManager; private final ActionManager actionManager; - public DeveloperIssuesReport(OutlookDateManager outlookDateManager, ApplicationProperties appProps, - ConstantsManager constantsManager, SearchProvider searchProvider, IssueManager issueManager, - ProjectManager projectManager, VersionManager versionManager, PermissionManager permissionManager, - PluginManager pluginManager, ActionManager actionManager) + public DeveloperIssuesReport(OutlookDateManager outlookDateManager, + ConstantsManager constantsManager, SearchProvider searchProvider, + ActionManager actionManager) { this.outlookDateManager = outlookDateManager; this.searchProvider = searchProvider; - this.issueManager = issueManager; this.constantsManager = constantsManager; - this.appProps = appProps; - this.projectManager = projectManager; - this.versionManager = versionManager; - this.permissionManager = permissionManager; - this.pluginManager = pluginManager; this.actionManager = actionManager; } @@ -86,7 +67,6 @@ * @param n Number of months */ private void nMonthsBack(Calendar cal, int n) { - int day = cal.get(Calendar.DAY_OF_MONTH); int month = cal.get(Calendar.MONTH); int year = cal.get(Calendar.YEAR); Modified: qa/jira-extensions/developersinvolvement-report/src/etc/pl/net/mamut/jira/developersinvolvement/developersinvolvement_report.properties =================================================================== --- qa/jira-extensions/developersinvolvement-report/src/etc/pl/net/mamut/jira/developersinvolvement/developersinvolvement_report.properties 2005-08-27 18:32:14 UTC (rev 994) +++ qa/jira-extensions/developersinvolvement-report/src/etc/pl/net/mamut/jira/developersinvolvement/developersinvolvement_report.properties 2005-08-27 18:37:59 UTC (rev 995) @@ -6,9 +6,9 @@ report.developersinvolvement.enddate = End Date report.developersinvolvement.enddate.description = The end of the period. report.developersinvolvement.showusers = Show Users -report.developersinvolvement.showusers.description = Select weather to show all users or only active +report.developersinvolvement.showusers.description = Select whether to show all users or only active report.developersinvolvement.showproj = Show Projects -report.developersinvolvement.showproj.description = Select weather to show all projects or only active +report.developersinvolvement.showproj.description = Select whether to show all projects or only active report.developersinvolvement.enddate.required = A valid "End Date" is required to generate this report. report.developersinvolvement.error = Error occurred generating Issue Creation Report. Modified: qa/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java =================================================================== --- qa/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-27 18:32:14 UTC (rev 994) +++ qa/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-27 18:37:59 UTC (rev 995) @@ -1,28 +1,16 @@ package pl.net.mamut.jira; -import com.atlassian.core.util.DateUtils; import com.atlassian.jira.issue.IssueManager; -import com.atlassian.jira.issue.index.DocumentConstants; -import com.atlassian.jira.issue.search.SearchException; -import com.atlassian.jira.issue.search.SearchProvider; -import com.atlassian.jira.issue.search.SearchRequest; -import com.atlassian.jira.issue.search.parameters.lucene.DateParameter; -import com.atlassian.jira.issue.search.parameters.lucene.ProjectParameter; import com.atlassian.jira.web.bean.PercentageGraphModel; import com.atlassian.jira.web.bean.PercentageGraphRow; -import com.atlassian.jira.plugin.report.impl.AbstractReport; import com.atlassian.jira.project.ProjectManager; import com.atlassian.jira.issue.ActionManager; import com.atlassian.jira.util.I18nHelper; import com.atlassian.jira.util.ParameterUtils; import com.atlassian.jira.web.action.ProjectActionSupport; import com.atlassian.jira.web.bean.I18nBean; -import com.atlassian.jira.web.util.OutlookDate; -import com.atlassian.jira.web.util.OutlookDateManager; import com.opensymphony.user.User; import java.sql.Timestamp; -import org.apache.log4j.Logger; -import org.ofbiz.core.entity.EntityOperator; import com.atlassian.jira.plugin.report.ReportModuleDescriptor; import com.atlassian.jira.plugin.globalreport.impl.AbstractGlobalReport; import com.atlassian.jira.issue.action.ChangeHistory; Modified: qa/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java =================================================================== --- qa/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-08-27 18:32:14 UTC (rev 994) +++ qa/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-08-27 18:37:59 UTC (rev 995) @@ -1,34 +1,19 @@ package pl.net.mamut.jira; -import com.atlassian.core.util.DateUtils; import com.atlassian.jira.issue.IssueManager; -import com.atlassian.jira.issue.index.DocumentConstants; -import com.atlassian.jira.issue.search.SearchException; -import com.atlassian.jira.issue.search.SearchProvider; -import com.atlassian.jira.issue.search.SearchRequest; -import com.atlassian.jira.issue.search.parameters.lucene.DateParameter; -import com.atlassian.jira.issue.search.parameters.lucene.ProjectParameter; -import com.atlassian.jira.web.bean.PercentageGraphModel; -import com.atlassian.jira.web.bean.PercentageGraphRow; -import com.atlassian.jira.plugin.report.impl.AbstractReport; import com.atlassian.jira.project.ProjectManager; import com.atlassian.jira.issue.ActionManager; import com.atlassian.jira.util.I18nHelper; import com.atlassian.jira.util.ParameterUtils; import com.atlassian.jira.web.action.ProjectActionSupport; import com.atlassian.jira.web.bean.I18nBean; -import com.atlassian.jira.web.util.OutlookDate; -import com.atlassian.jira.web.util.OutlookDateManager; import com.opensymphony.user.User; import java.sql.Timestamp; -import org.apache.log4j.Logger; -import org.ofbiz.core.entity.EntityOperator; import com.atlassian.jira.plugin.report.ReportModuleDescriptor; import com.atlassian.jira.plugin.globalreport.impl.AbstractGlobalReport; import com.atlassian.jira.issue.action.ChangeHistory; import org.ofbiz.core.entity.GenericValue; import java.text.DateFormat; -import com.atlassian.jira.web.action.admin.user.UserBrowser; import java.util.*; /**Report to generate number of resolved issues in projects for a given period Modified: qa/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/navigator/rnotes.jsp =================================================================== --- qa/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 18:32:14 UTC (rev 994) +++ qa/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 18:37:59 UTC (rev 995) @@ -8,7 +8,8 @@ com.atlassian.jira.web.component.IssueTableWebComponent, com.atlassian.jira.issue.search.SearchResults, com.atlassian.jira.config.ConstantsManager, - com.atlassian.jira.web.bean.PagerFilter"%> + com.atlassian.jira.web.bean.PagerFilter, + com.opensymphony.util.TextUtils"%> <%@ taglib uri="webwork" prefix="webwork" %> <%@ taglib uri="sitemesh-page" prefix="page" %> @@ -70,7 +71,8 @@ IssueNavigator issueNavigator = (IssueNavigator) request.getAttribute("issueNavigator"); SearchResults searchResults = issueNavigator.getSearchResults(); List issues = searchResults.getIssues(); - + TextUtils textUtils = new TextUtils(); + Iterator iter; /* Map: issue type id -> (Set of issue) */ Map issuesMap = new TreeMap(); @@ -109,7 +111,7 @@ [ <a href="<%= request.getContextPath() %>/browse/<%= issue.getString("key") %>"> <%= issue.getString("key") %> </a> ] - <%= issue.getString("summary") %> + <%= textUtils.htmlEncode(issue.getString("summary")) %> </li> <% } @@ -138,7 +140,7 @@ %> * [ <%= issue.getString("key") %> ] - <%= issue.getString("summary") %> + <%= textUtils.htmlEncode(issue.getString("summary")) %> <br /> <% } Copied: qa/jira-extensions/jira-file-modifications/jira-3.3 (from rev 993, trunk/jira-extensions/jira-file-modifications/jira-3.3) Copied: qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp (from rev 993, trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp) Copied: qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF (from rev 993, trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF) Copied: qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes (from rev 993, trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes) Deleted: qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/actions.xml =================================================================== --- trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/actions.xml 2005-08-27 17:52:21 UTC (rev 993) +++ qa/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/actions.xml 2005-08-27 18:37:59 UTC (rev 995) @@ -1,2199 +0,0 @@ -<!-- Actions for the JIRA Web Application --> -<actions> - - <!-- Entity Administration --> - <action name="user.Logout" alias="Logout"> - <view name="error">/logoutconfirm.jsp</view> - <view name="confirm">/logoutconfirm.jsp</view> - <view name="logout">/logout.jsp</view> - </action> - - <action name="project.AddProject" alias="AddProject" roles-required="admin"> - <view name="error">/secure/admin/views/addproject.jsp</view> - <view name="input">/secure/admin/views/addproject.jsp</view> - </action> - - <action name="project.DeleteProject" alias="DeleteProject" roles-required="admin"> - <view name="success">/secure/admin/default.jsp</view> - <view name="error">/secure/admin/views/deleteprojectconfirm.jsp</view> - <view name="input">/secure/admin/views/deleteprojectconfirm.jsp</view> - </action> - - <action name="admin.notification.SelectProjectScheme" alias="SelectProjectScheme" roles-required="admin"> - <view name="success">/secure/project/views/notifications/selectprojectscheme.jsp</view> - <view name="input">/secure/project/views/notifications/selectprojectscheme.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="admin.workflow.scheme.SelectProjectWorkflowScheme" alias="SelectProjectWorkflowScheme" roles-required="admin"> - <view name="input">/secure/project/views/workflows/selectprojectscheme.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="admin.workflow.scheme.SelectProjectWorkflowSchemeStep2" alias="SelectProjectWorkflowSchemeStep2" roles-required="admin"> - <view name="success">/secure/project/views/workflows/selectprojectschemestep2.jsp</view> - <view name="error">/secure/project/views/workflows/selectprojectschemestep2.jsp</view> - <view name="input">/secure/project/views/workflows/selectprojectschemestep2.jsp</view> - <view name="workflowmigrationerror">/secure/views/workflowmigrationerror.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.SelectProjectCategory" alias="SelectProjectCategory" roles-required="admin"> - <view name="success">/secure/project/views/selectprojectcategory.jsp</view> - <view name="input">/secure/project/views/selectprojectcategory.jsp</view> - </action> - - <action name="admin.permission.SelectProjectPermissionScheme" alias="SelectProjectPermissionScheme" roles-required="admin"> - <view name="success">/secure/project/views/permissions/selectprojectpermissionscheme.jsp</view> - <view name="input">/secure/project/views/permissions/selectprojectpermissionscheme.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="admin.issuesecurity.SelectProjectIssueSecurityScheme" alias="SelectProjectIssueSecurityScheme" roles-required="admin"> - <view name="success">/secure/project/views/issuesecurity/selectprojectissuesecurityscheme.jsp</view> - <view name="input">/secure/project/views/issuesecurity/selectprojectissuesecurityscheme.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="admin.workflow.ActivateWorkflow" alias="ActivateWorkflow" roles-required="admin"> - <view name="workflowmigrationerror">/secure/views/workflowmigrationerror.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <!-- User Administration --> - <action name="admin.user.GroupBrowser" alias="GroupBrowser" roles-required="admin"> - <view name="success">/secure/admin/user/views/groupbrowser.jsp</view> - </action> - - <action name="admin.user.ViewGroup" alias="ViewGroup" roles-required="admin"> - <view name="success">/secure/admin/user/views/viewgroup.jsp</view> - </action> - - <action name="admin.user.DeleteGroup" alias="DeleteGroup" roles-required="admin"> - <view name="error">/secure/admin/user/views/deletegroupconfirm.jsp</view> - <view name="input">/secure/admin/user/views/deletegroupconfirm.jsp</view> - </action> - - <action name="admin.user.UserBrowser" alias="UserBrowser" roles-required="admin"> - <view name="success">/secure/admin/user/views/userbrowser.jsp</view> - </action> - - <action name="admin.user.UserPickerBrowser" alias="UserPickerBrowser" roles-required="pickusers"> - <view name="success">/secure/popups/userpicker.jsp</view> - <view name="input">/secure/popups/userpicker.jsp</view> - </action> - - <action name="issue.navigator.DateRangePicker" alias="DateRangePicker"> - <view name="duedate">/secure/popups/duedatepicker.jsp</view> - <view name="generic">/secure/popups/daterangepicker.jsp</view> - </action> - - <action name="admin.IconPicker" alias="IconPicker"> - <view name="error">/secure/popups/iconpicker.jsp</view> - <view name="success">/secure/popups/iconpicker.jsp</view> - </action> - - <action name="admin.user.AddUser" alias="AddUser" roles-required="admin"> - <view name="error">/secure/admin/user/views/adduser.jsp</view> - <view name="input">/secure/admin/user/views/adduser.jsp</view> - </action> - - <action name="admin.user.ViewUser" alias="ViewUser" roles-required="admin"> - <view name="success">/secure/admin/user/views/viewuser.jsp</view> - <view name="error">/secure/admin/user/views/viewuser.jsp</view> - </action> - - <action name="admin.user.EditUser" alias="EditUser" roles-required="admin"> - <view name="error">/secure/admin/user/views/editprofile.jsp</view> - <view name="input">/secure/admin/user/views/editprofile.jsp</view> - </action> - - <action name="admin.user.EditUserGroups" alias="EditUserGroups" roles-required="admin"> - <view name="error">/secure/admin/user/views/editusergroups.jsp</view> - <view name="success">/secure/admin/user/views/editusergroups.jsp</view> - </action> - - <action name="admin.user.DeleteUser" alias="DeleteUser" roles-required="admin"> - <view name="error">/secure/admin/user/views/deleteuserconfirm.jsp</view> - <view name="input">/secure/admin/user/views/deleteuserconfirm.jsp</view> - </action> - - <action name="admin.user.SetPassword" alias="SetPassword" roles-required="admin"> - <view name="error">/secure/admin/user/views/setpassword.jsp</view> - <view name="input">/secure/admin/user/views/setpassword.jsp</view> - </action> - - <action name="project.EditVersionDetails" alias="EditVersionDetails"> - <view name="success">/secure/project/views/editversiondetails.jsp</view> - <view name="error">/secure/project/views/editversiondetails.jsp</view> - <view name="input">/secure/project/views/editversiondetails.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <!-- Project administration --> - <action name="project.ViewProjects" alias="ViewProjects"> - <view name="success">/secure/project/views/viewprojects.jsp</view> - </action> - - <action name="project.ViewProject" alias="ViewProject"> - <view name="input">/secure/project/views/viewprojecterror.jsp</view> - <view name="success">/secure/project/views/viewproject.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.EditProject" alias="EditProject"> - <view name="success">/secure/project/views/editproject.jsp</view> - <view name="error">/secure/project/views/editproject.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.AddComponent" alias="AddComponent"> - <view name="success">/secure/project/views/addcomponent.jsp</view> - <view name="error">/secure/project/views/addcomponent.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.DeleteComponent" alias="DeleteComponent"> - <view name="success">/secure/project/views/deletecomponentconfirm.jsp</view> - <view name="error">/secure/project/views/deletecomponentconfirm.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.EditComponent" alias="EditComponent"> - <view name="success">/secure/project/views/editcomponent.jsp</view> - <view name="error">/secure/project/views/editcomponent.jsp</view> - <view name="input">/secure/project/views/editcomponent.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.enterprise.SelectComponentAssignees" alias="SelectComponentAssignees"> - <view name="error">/secure/project/views/select_componentassignees.jsp</view> - <view name="input">/secure/project/views/select_componentassignees.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.ManageVersions" alias="ManageVersions"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - <command name="moveUp" alias="VersionUp"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="error">/secure/project/views/manageversions.jsp</view> - </command> - <command name="moveDown" alias="VersionDown"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="error">/secure/project/views/manageversions.jsp</view> - </command> - <command name="moveFirst" alias="VersionFirst"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="error">/secure/project/views/manageversions.jsp</view> - </command> - <command name="moveLast" alias="VersionLast"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="error">/secure/project/views/manageversions.jsp</view> - </command> - </action> - - <action name="project.AddVersion" alias="AddVersion"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="error">/secure/project/views/manageversions.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.EditVersionReleaseDate" alias="EditVersionReleaseDate"> - <view name="success">/secure/project/views/editversionreleasedate.jsp</view> - <view name="error">/secure/project/views/editversionreleasedate.jsp</view> - <view name="input">/secure/project/views/editversionreleasedate.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.EditVersionReleases" alias="EditVersionReleases"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="input">/secure/project/views/checkversionreleases.jsp</view> - <view name="checkrelease">/secure/project/views/checkversionreleases.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.EditVersionArchives" alias="EditVersionArchives"> - <view name="success">/secure/project/views/manageversions.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.MergeVersions" alias="MergeVersions"> - <view name="success">/secure/project/views/mergeversionconfirm.jsp</view> - <view name="input">/secure/project/views/mergeversionselect.jsp</view> - <view name="error">/secure/project/views/mergeversionselect.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - <command name="merge" alias="Merge"> - <view name="error">/secure/project/views/mergeversionselect.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </command> - </action> - - <action name="project.RescheduleVersions" alias="RescheduleVersions"> - <view name="success">/secure/project/views/rescheduleversions.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <action name="project.DeleteVersion" alias="DeleteVersion"> - <view name="success">/secure/project/views/deleteversionconfirm.jsp</view> - <view name="error">/secure/project/views/deleteversionconfirm.jsp</view> - <view name="securitybreach">/secure/views/securitybreach.jsp</view> - </action> - - <!--ProjectCategory Actions--> - <action name="projectcategory.AddProjectCategory" alias="ViewProjectCategories" roles-required="admin"> - <view name="success">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> - <view name="input">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> - <view name="error">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> - </action> - - <action name="projectcategory.AddProjectCategory" alias="AddProjectCategory" roles-required="admin"> - <view name="input">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> - <view name="error">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view> - </action> - - <action name="projectcategory.EditProjectCategory" alias="EditProjectCategory" roles-required="admin"> - <view name="input">/secure/admin/views/projectcategory/editprojectcategory.jsp</view> - <view name="error">/secure/admin/views/projectcategory/editprojectcategory.jsp</view> - </action> - - <action name="projectcategory.DeleteProjectCategory" alias="DeleteProjectCategory" roles-required="admin"> - <view name="input">/secure/admin/views/projectcategory/deleteprojectcategoryconfirm.jsp</view> - <view name="error">/secure/admin/views/projectcategory/deleteprojectcategoryconfirm.jsp</view> - </action> - - <!-- Utility Actions --> - <action name="util.ExportAll" alias="XmlBackup" roles-required="admin"> - <view name="success">/secure/admin/views/exportall_result.jsp</view> - <view name="error">/secure/admin/views/exportall_options.jsp</view> - <view name="confirm">/secure/admin/views/exportall_confirm.jsp</view> - <view name="fixchars">/secure/admin/views/exportall_fixchars.jsp</view> - <view name="input">/secure/admin/views/exportall_options.jsp</view> - </action> - - <action name="util.ImportAll" alias="XmlRestore" roles-required="admin"> - <view name="success">/secure/admin/views/importall_result.jsp</view> - <view name="error">/secure/admin/views/importall_options.jsp</view> - <view name="input">/secure/admin/views/importall_options.jsp</view> - </action> - - <!-- The security check is built into this action, as the user is not loged in - when it is called. --> - <action name="util.CleanData" alias="CleanData"> - <view name="success">/views/cleandatabase.jsp</view> - <view name="error">/views/cleandatabase.jsp</view> - </action> - <action name="util.LDAPConfigurer" alias="LDAPConfigurer"> - <view name="success">/views/ldapconfigurer_result.jsp</view> - <view name="error">/views/ldapconfigurer.jsp</view> - </action> - - <action name="util.BugzillaImport" alias="BugzillaImport" roles-required="admin"> - <view name="input">/secure/admin/views/bugzillaimport/bugzilla_connect.jsp</view> - <view name="success">/secure/admin/views/bugzillaimport/bugzilla_select.jsp</view> - <view name="error">/secure/admin/views/bugzillaimport/bugzilla_connect.jsp</view> - - <view name="monitor">/secure/admin/views/bugzillaimport/bugzilla_monitor.jsp?decorator=none</view> - - <command name="setProjectDefaults" alias="BugzillaSetProjectDefaults"> - <view name="choosemappings">/secure/admin/views/bugzillaimport/bugzilla_choosemappings.jsp</view> - </command> - - <command name="run" alias="BugzillaRun"> - <view name="success">/secure/admin/views/bugzillaimport/bugzilla_run.jsp</view> - <view name="input">/secure/admin/views/bugzillaimport/bugzilla_choosemappings.jsp</view> - <view name="error">/secure/admin/views/bugzillaimport/bugzilla_select.jsp</view> - </command> - - </action> - <action name="util.MantisImport" alias="MantisImport" roles-required="admin"> - <view name="input">/secure/admin/views/mantisimport/mantis_connect.jsp</view> - <view name="success">/secure/admin/views/mantisimport/mantis_select.jsp</view> - <view name="error">/secure/admin/views/mantisimport/mantis_connect.jsp</view> - - <view name="monitor">/secure/admin/views/mantisimport/mantis_monitor.jsp?decorator=none</view> - - <command name="setProjectDefaults" alias="MantisSetProjectDefaults"> - <view name="choosemappings">/secure/admin/views/mantisimport/mantis_choosemappings.jsp</view> - </command> - - <command name="run" alias="MantisRun"> - <view name="success">/secure/admin/views/mantisimport/mantis_run.jsp</view> - <view name="input">/secure/admin/views/mantisimport/mantis_choosemappings.jsp</view> - <view name="error">/secure/admin/views/mantisimport/mantis_select.jsp</view> - </command> - </action> - - <action name="util.TestTrackProXMLImport" alias="TestTrackProXMLImport" roles-required="admin"> - <view name="input">/secure/admin/views/testtrackproimport/testtrackpro_xmlimport.jsp</view> - <view name="success">/secure/admin/views/testtrackproimport/testtrackpro_xmlimport.jsp</view> - </action> - - <action name="util.CsvImporter" alias="CsvImport" roles-required="admin"> - <view name="error">/secure/admin/views/importers/csv/csvimport.jsp</view> - <view name="input">/secure/admin/views/importers/csv/csvimport.jsp</view> - <view name="settings">/secure/admin/views/importers/csv/importsettings.jsp</view> - <view name="logs">/secure/admin/views/importers/csv/viewlogs.jsp</view> - <view name="finished">/secure/admin/views/importers/csv/finishedimport.jsp</view> - <view name="success">/secure/admin/views/importers/csv/csvimport.jsp</view> - </action> - - <action name="util.csv.ConfigureCsvMapping" alias="ConfigureCsvMapping" roles-required="admin"> - <view name="error">/secure/admin/views/importers/csv/csvconfig.jsp</view> - <view name="input">/secure/admin/views/importers/csv/csvconfig.jsp</view> - <view name="1">/secure/admin/views/importers/csv/configproject.jsp</view> - <view name="2">/secure/admin/views/importers/csv/configissuemapping.jsp</view> - <view name="3">/secure/admin/views/importers/csv/configvaluemapping.jsp</view> - <view name="5">/secure/admin/views/importers/csv/savepropertiesfile.jsp</view> - <view name="4">/secure/admin/views/importers/csv/configdateuserdefaults.jsp</view> - <view name="success">/secure/admin/views/importers/csv/csvimport.jsp</view> - <view name="importwithoutsaving">CsvImport!settings.jspa</view> - </action> - - <!-- <action name="util.IdsImporter" alias="IdsImport" roles-required="admin">--> - <!-- <view name="input">/secure/admin/views/importers/importcsv.jsp</view>--> - <!-- <view name="success">/secure/admin/views/importers/importcsv.jsp</view>--> - <!-- </action>--> - <!-- <action name="util.XmlImporter" alias="XmlImport" roles-required="admin">--> - <!-- <view name="input">/secure/admin/views/importers/xmlimport.jsp</view>--> - <!-- <view name="success">/secure/admin/views/importers/xmlimport.jsp</view>--> - <!-- </action>--> - - <action name="util.ShowConstantsHelp" alias="ShowConstantsHelp" roles-required="use"> - <view name="success">/secure/showconstantshelp.jsp</view> - </action> - - <action name="util.JellyRunner" alias="JellyRunner" roles-required="admin"> - <view name="input">/secure/admin/views/jelly_runner.jsp</view> - <view name="error">/secure/admin/views/jelly_runner.jsp</view> - <view name="success">/secure/admin/views/jelly_result.jsp</view> - </action> - - <!-- JIRA Administration --> - <action name="admin.ViewPlugins" alias="ViewPlugins" roles-required="admin"> - <view name="input">/secure/admin/views/plugins/viewplugins.jsp</view> - <view name="success">/secure/admin/views/plugins/viewplugins.jsp</view> - </action> - - <action name="admin.ViewListeners" alias="ViewListeners" roles-required="admin"> - <view name="input">/secure/admin/views/listeners/viewlisteners.jsp</view> - <view name="success">/secure/admin/views/listeners/viewlisteners.jsp</view> - </action> - - <action name="admin.EditListener" alias="EditListener" roles-required="admin"> - <view name="input">/secure/admin/views/listeners/editlistener.jsp</view> - <view name="error">/secure/admin/views/listeners/editlistener.jsp</view> - </action> - - <action name="admin.ViewServices" alias="ViewServices" roles-required="admin"> - <view name="input">/secure/admin/views/services/viewservices.jsp</view> - <view name="success">/secure/admin/views/services/viewservices.jsp</view> - </action> - - <action name="admin.EditService" alias="EditService" roles-required="admin"> - <view name="input">/secure/admin/views/services/editservice.jsp</view> - <view name="error">/secure/admin/views/services/editservice.jsp</view> - </action> - - <action name="admin.linking.ViewLinkTypes" alias="ViewLinkTypes" roles-required="admin"> - <view name="input">/secure/admin/jira/views/viewlinktypes.jsp</view> - <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view> - <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view> - - <command name="activate" alias="IssueLinkingActivate"> - <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view> - <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view> - </command> - <command name="deactivate" alias="IssueLinkingDeActivate"> - <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view> - <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view> - </command> - </action> - - <action name="admin.linking.EditLinkType" alias="EditLinkType" roles-required="admin"> - <view name="input">/secure/admin/jira/views/editlinktype.jsp</view> - <view name="error">/secure/admin/jira/views/editlinktype.jsp</view> - </action> - - <action name="admin.linking.DeleteLinkType" alias="DeleteLinkType" roles-required="admin"> - <view name="input">/secure/admin/jira/views/deletelinktype.jsp</view> - <view name="error">/secure/admin/jira/views/deletelinktype.jsp</view> - </action> - - <action name="admin.ViewApplicationProperties" alias="ViewApplicationProperties" roles-required="admin"> - <view name="success">/secure/admin/jira/views/applicationproperties.jsp</view> - </action> - - <action name="admin.ViewAttachmentSettings" alias="ViewAttachmentSettings" roles-required="admin"> - <view name="success">/secure/admin/jira/views/attachments.jsp</view> - </action> - - <action name="admin.SchedulerAdmin" alias="SchedulerAdmin" roles-required="admin"> - <view name="success">/secure/admin/jira/views/scheduleradmin.jsp</view> - </action> - - <action name="admin.MailQueueAdmin" alias="MailQueueAdmin" roles-required="admin"> - <view name="input">/secure/admin/jira/views/mailqueueadmin.jsp</view> - <view name="success">/secure/admin/jira/views/mailqueueadmin.jsp</view> - </action> - - <action name="admin.IndexAdminImpl" alias="IndexAdmin" roles-required="admin"> - <view name="success">/secure/admin/jira/views/indexing.jsp</view> - <view name="error">/secure/admin/jira/views/indexing.jsp</view> - - <command name="reindex" alias="IndexReIndex"> - <view name="success">/secure/admin/jira/views/indexing.jsp</view> - <view name="error">/secure/admin/jira/views/indexing.jsp</view> - </command> - <command name="activate" alias="IndexActivate"> - <view name="success">/secure/admin/jira/views/indexing.jsp</view> - <view name="error">/secure/admin/jira/views/indexing.jsp</view> - </command> - <command name="deactivate" alias="IndexDeActivate"> - <view name="success">/secure/admin/jira/views/indexing.jsp</view> - <view name="error">/secure/admin/jira/views/indexing.jsp</view> - </command> - </action> - - <action name="admin.TimeTrackingAdmin" alias="TimeTrackingAdmin" roles-required="admin"> - <view name="success">/secure/admin/jira/views/timetracking.jsp</view> - <view name="error">/secure/admin/jira/views/timetracking.jsp</view> - - <command name="activate" alias="TimeTrackingActivate"> - <view name="success">/secure/admin/jira/views/timetracking.jsp</view> - <view name="error">/secure/admin/jira/views/timetracking.jsp</view> - </command> - <command name="deactivate" alias="TimeTrackingDeActivate"> - <view name="success">/secure/admin/jira/views/timetracking.jsp</view> - <view name="error">/secure/admin/jira/views/timetracking.jsp</view> - </command> - </action> - - <action name="admin.TrackbackAdmin" alias="TrackbackAdmin" roles-required="admin"> - <view name="success">/secure/admin/jira/views/trackback.jsp</view> - <view name="input">/secure/admin/jira/views/edittrackback.jsp</view> - <view name="error">/secure/admin/jira/views/edittrackback.jsp</view> - - <command name="activate" alias="TrackbackActivate"> - <view name="success">/secure/admin/jira/views/trackback.jsp</view> - <view name="error">/secure/admin/jira/views/trackback.jsp</view> - </command> - <command name="deactivate" alias="TrackbackDeActivate"> - <view name="success">/secure/admin/jira/views/trackback.jsp</view> - <view name="error">/secure/admin/jira/views/trackback.jsp</view> - </command> - </action> - - <action name="admin.ConfigureDefaultPortal" alias="EditDefaultDashboard" roles-required="admin"> - <view name="input">/secure/admin/views/editdefaultdashboardconfig.jsp</view> - <view name="error">/secure/admin/views/editdefaultdashboardconfig.jsp</view> - </action> - - <action name="admin.AddDefaultPortlet" alias="AddDefaultPortlet" roles-required="admin"> - <view name="error">/secure/admin/views/editdefaultdashboardconfig.jsp</view> - <view name="input">/secure/admin/views/adddefaultportlet.jsp</view> - </action> - - <action name="admin.SaveDefaultConfiguration" alias="SaveDefaultPortlet" roles-required="admin"> - <view name="input">/secure/admin/views/configuredefaultportlet.jsp</view> - </action> - - <action name="admin.ViewLicense" alias="ViewLicense" roles-required="admin"> - <view name="success">/secure/admin/jira/views/viewlicense.jsp</view> - <view name="input">/secure/admin/jira/views/viewlicense.jsp</view> - <view name="error">/secure/admin/jira/views/viewlicense.jsp</view> - <view name="oldlicense">/secure/errors.jsp</view> - </action> - - <action name="admin.EditApplicationProperties" alias="EditApplicationProperties" roles-required="admin"> - <view name="error">/secure/admin/jira/views/editapplicationproperties.jsp</view> - <view name="input">/secure/admin/jira/views/editapplicationproperties.jsp</view> - </action> - - <action name="admin.EditAttachmentSettings" alias="EditAttachmentSettings" roles-required="admin"> - <view name="error">/secure/admin/jira/views/editattachmentsettings.jsp</view> - <view name="input">/secure/admin/jira/views/editattachmentsettings.jsp</view> - </action> - - <action name="admin.GlobalPermissions" alias="GlobalPermissions" roles-required="admin"> - <view name="success">/secure/admin/jira/views/globalpermissions.jsp</view> - <view name="error">/secure/admin/jira/views/globalpermissions.jsp</view> - </action> - - <action name="admin.ViewLookAndFeel" alias="ViewLookAndFeel" roles-required="admin"> - <view name="success">/secure/admin/jira/views/lookandfeel.jsp</view> - </action> - - <action name="admin.EditLookAndFeel" alias="EditLookAndFeel" roles-required="admin"> - <view name="input">/secure/admin/jira/views/editlookandfeel.jsp</view> - <view name="error">/secure/admin/jira/views/editlookandfeel.jsp</view> - </action> - - <action name="admin.ConfigureIssueCache" a... [truncated message content] |
|
From: <jbo...@li...> - 2005-08-27 18:32:19
|
Author: dam...@jb... Date: 2005-08-27 14:32:14 -0400 (Sat, 27 Aug 2005) New Revision: 994 Added: qa/jira-extensions/ Removed: qa/forge/jira-extensions/ Log: Moved jira-extensions out of forge. Got to lock it down. Copied: qa/jira-extensions (from rev 993, qa/forge/jira-extensions) |
Author: adamw
Date: 2005-08-27 13:52:21 -0400 (Sat, 27 Aug 2005)
New Revision: 993
Modified:
trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml
trunk/jira-extensions/changelog-report/src/etc/pl/net/mamut/jira/changelog_report.properties
trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java
trunk/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java
trunk/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java
trunk/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java
trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/table/header.jsp
trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp
trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java
trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java
trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java
trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java
trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java
trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java
trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml
trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties
trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java
Log:
jira 3.3 compatibility & fixes
Modified: trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml
===================================================================
--- trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 17:52:21 UTC (rev 993)
@@ -1,12 +1,12 @@
<atlassian-plugin key="pl.net.mamut.jira.changelogreport" name="Released project versions report">
<plugin-info>
- <description>A seleased project versions global report plugin.</description>
+ <description>Released project versions global report plugin.</description>
<version>1.0</version>
<application-version min="3.0" max="3.0"/>
<vendor name="Adam Warski" url="http://mamut.net.pl/"/>
</plugin-info>
- <report-global key="changelog" name="Released project versions report" class="pl.net.mamut.jira.ChangelogGlobalReport">
+ <report-global key="changelog" name="Project changelog report" class="pl.net.mamut.jira.ChangelogGlobalReport">
<description key="report.changelog.description">i18n description</description>
<label key="report.changelog.label" />
Modified: trunk/jira-extensions/changelog-report/src/etc/pl/net/mamut/jira/changelog_report.properties
===================================================================
--- trunk/jira-extensions/changelog-report/src/etc/pl/net/mamut/jira/changelog_report.properties 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/changelog-report/src/etc/pl/net/mamut/jira/changelog_report.properties 2005-08-27 17:52:21 UTC (rev 993)
@@ -1,5 +1,5 @@
-report.changelog.label = Released project versions report
-report.changelog.name = Released project versions report
+report.changelog.label = Project changelog report
+report.changelog.name = Project changelog report
report.changelog.description = Generates a changelog-like view of released versions of selected projects, for a given period of time, including selected issue types and priorities.
report.changelog.projects.name = Projects
report.changelog.projects.description = Select projects which you want to include in the report.
Modified: trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java
===================================================================
--- trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 17:52:21 UTC (rev 993)
@@ -5,7 +5,10 @@
package pl.net.mamut.jira;
import com.atlassian.jira.config.ConstantsManager;
+import com.atlassian.jira.config.SubTaskManager;
import com.atlassian.jira.config.properties.ApplicationProperties;
+import com.atlassian.jira.issue.IssueImpl;
+import com.atlassian.jira.issue.IssueManager;
import com.atlassian.jira.issue.search.SearchException;
import com.atlassian.jira.issue.search.SearchProvider;
import com.atlassian.jira.issue.search.SearchRequest;
@@ -13,6 +16,7 @@
import com.atlassian.jira.issue.search.parameters.lucene.IssueTypeParameter;
import com.atlassian.jira.issue.search.parameters.lucene.PriorityParameter;
import com.atlassian.jira.issue.search.parameters.lucene.ProjectParameter;
+import com.atlassian.jira.issue.security.IssueSecurityLevelManager;
import com.atlassian.jira.plugin.globalreport.impl.AbstractGlobalReport;
import com.atlassian.jira.plugin.report.ReportModuleDescriptor;
import com.atlassian.jira.project.ProjectManager;
@@ -43,17 +47,25 @@
private final OutlookDateManager outlookDateManager;
private final ProjectManager projectManager;
private final VersionManager versionManager;
+ private final IssueManager issueManager;
+ private final SubTaskManager subTaskManager;
+ private final IssueSecurityLevelManager issueSecurityLevelManager;
public ChangelogGlobalReport(OutlookDateManager outlookDateManager, ApplicationProperties appProps,
ConstantsManager constantsManager, SearchProvider searchProvider,
- ProjectManager projectManager, VersionManager versionManager)
+ ProjectManager projectManager, VersionManager versionManager,
+ IssueManager issueManager, SubTaskManager subTaskManager,
+ IssueSecurityLevelManager issueSecurityLevelManager)
{
this.outlookDateManager = outlookDateManager;
this.searchProvider = searchProvider;
this.constantsManager = constantsManager;
this.appProps = appProps;
this.projectManager = projectManager;
- this.versionManager = versionManager;
+ this.versionManager = versionManager;
+ this.issueManager = issueManager;
+ this.subTaskManager = subTaskManager;
+ this.issueSecurityLevelManager = issueSecurityLevelManager;
}
/**
@@ -75,7 +87,19 @@
sr.addParameter(new IssueTypeParameter(sections));
sr.addParameter(new PriorityParameter(priorities));
sr.addParameter(new ProjectParameter(projectId));
- return searchProvider.search(sr, remoteUser);
+
+ // Converting the list of issues represented by generic values
+ // to a list of wrappers.
+ List gvIssues = searchProvider.search(sr, remoteUser);
+ List wrIssues = new ArrayList();
+
+ for (Iterator iter = gvIssues.iterator(); iter.hasNext();)
+ wrIssues.add(new IssueImpl((GenericValue) iter.next(),
+ issueManager, projectManager, versionManager,
+ issueSecurityLevelManager, constantsManager,
+ subTaskManager));
+
+ return wrIssues;
}
private int min(int a, int b) { if (a < b) return a; else return b; }
Modified: trunk/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java
===================================================================
--- trunk/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/developer-issues-report/src/java/pl/net/mamut/jira/DeveloperIssuesReport.java 2005-08-27 17:52:21 UTC (rev 993)
@@ -1,17 +1,12 @@
package pl.net.mamut.jira;
import com.atlassian.jira.config.ConstantsManager;
-import com.atlassian.jira.config.properties.ApplicationProperties;
-import com.atlassian.jira.issue.IssueManager;
import com.atlassian.jira.issue.search.SearchException;
import com.atlassian.jira.issue.search.SearchProvider;
import com.atlassian.jira.issue.search.SearchRequest;
import com.atlassian.jira.issue.search.parameters.lucene.ProjectParameter;
import com.atlassian.jira.issue.search.parameters.lucene.ResolutionParameter;
-import com.atlassian.jira.project.ProjectManager;
-import com.atlassian.jira.project.version.VersionManager;
import com.atlassian.jira.issue.ActionManager;
-import com.atlassian.jira.security.PermissionManager;
import com.atlassian.jira.util.I18nHelper;
import com.atlassian.jira.util.ParameterUtils;
import com.atlassian.jira.web.action.ProjectActionSupport;
@@ -26,7 +21,6 @@
import org.ofbiz.core.entity.GenericValue;
import java.text.DateFormat;
import com.atlassian.jira.web.action.admin.user.UserBrowser;
-import com.atlassian.plugin.PluginManager;
import java.util.*;
@@ -36,30 +30,17 @@
*/
public class DeveloperIssuesReport extends AbstractGlobalReport {
private final SearchProvider searchProvider;
- private final IssueManager issueManager;
private final ConstantsManager constantsManager;
- private final ApplicationProperties appProps;
private final OutlookDateManager outlookDateManager;
- private final ProjectManager projectManager;
- private final VersionManager versionManager;
- private final PermissionManager permissionManager;
- private final PluginManager pluginManager;
private final ActionManager actionManager;
- public DeveloperIssuesReport(OutlookDateManager outlookDateManager, ApplicationProperties appProps,
- ConstantsManager constantsManager, SearchProvider searchProvider, IssueManager issueManager,
- ProjectManager projectManager, VersionManager versionManager, PermissionManager permissionManager,
- PluginManager pluginManager, ActionManager actionManager)
+ public DeveloperIssuesReport(OutlookDateManager outlookDateManager,
+ ConstantsManager constantsManager, SearchProvider searchProvider,
+ ActionManager actionManager)
{
this.outlookDateManager = outlookDateManager;
this.searchProvider = searchProvider;
- this.issueManager = issueManager;
this.constantsManager = constantsManager;
- this.appProps = appProps;
- this.projectManager = projectManager;
- this.versionManager = versionManager;
- this.permissionManager = permissionManager;
- this.pluginManager = pluginManager;
this.actionManager = actionManager;
}
@@ -86,7 +67,6 @@
* @param n Number of months
*/
private void nMonthsBack(Calendar cal, int n) {
- int day = cal.get(Calendar.DAY_OF_MONTH);
int month = cal.get(Calendar.MONTH);
int year = cal.get(Calendar.YEAR);
Modified: trunk/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java
===================================================================
--- trunk/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-27 17:52:21 UTC (rev 993)
@@ -1,28 +1,16 @@
package pl.net.mamut.jira;
-import com.atlassian.core.util.DateUtils;
import com.atlassian.jira.issue.IssueManager;
-import com.atlassian.jira.issue.index.DocumentConstants;
-import com.atlassian.jira.issue.search.SearchException;
-import com.atlassian.jira.issue.search.SearchProvider;
-import com.atlassian.jira.issue.search.SearchRequest;
-import com.atlassian.jira.issue.search.parameters.lucene.DateParameter;
-import com.atlassian.jira.issue.search.parameters.lucene.ProjectParameter;
import com.atlassian.jira.web.bean.PercentageGraphModel;
import com.atlassian.jira.web.bean.PercentageGraphRow;
-import com.atlassian.jira.plugin.report.impl.AbstractReport;
import com.atlassian.jira.project.ProjectManager;
import com.atlassian.jira.issue.ActionManager;
import com.atlassian.jira.util.I18nHelper;
import com.atlassian.jira.util.ParameterUtils;
import com.atlassian.jira.web.action.ProjectActionSupport;
import com.atlassian.jira.web.bean.I18nBean;
-import com.atlassian.jira.web.util.OutlookDate;
-import com.atlassian.jira.web.util.OutlookDateManager;
import com.opensymphony.user.User;
import java.sql.Timestamp;
-import org.apache.log4j.Logger;
-import org.ofbiz.core.entity.EntityOperator;
import com.atlassian.jira.plugin.report.ReportModuleDescriptor;
import com.atlassian.jira.plugin.globalreport.impl.AbstractGlobalReport;
import com.atlassian.jira.issue.action.ChangeHistory;
Modified: trunk/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java
===================================================================
--- trunk/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/issuesclosed-report/src/java/pl/net/mamut/jira/IssuesClosedReport.java 2005-08-27 17:52:21 UTC (rev 993)
@@ -1,34 +1,19 @@
package pl.net.mamut.jira;
-import com.atlassian.core.util.DateUtils;
import com.atlassian.jira.issue.IssueManager;
-import com.atlassian.jira.issue.index.DocumentConstants;
-import com.atlassian.jira.issue.search.SearchException;
-import com.atlassian.jira.issue.search.SearchProvider;
-import com.atlassian.jira.issue.search.SearchRequest;
-import com.atlassian.jira.issue.search.parameters.lucene.DateParameter;
-import com.atlassian.jira.issue.search.parameters.lucene.ProjectParameter;
-import com.atlassian.jira.web.bean.PercentageGraphModel;
-import com.atlassian.jira.web.bean.PercentageGraphRow;
-import com.atlassian.jira.plugin.report.impl.AbstractReport;
import com.atlassian.jira.project.ProjectManager;
import com.atlassian.jira.issue.ActionManager;
import com.atlassian.jira.util.I18nHelper;
import com.atlassian.jira.util.ParameterUtils;
import com.atlassian.jira.web.action.ProjectActionSupport;
import com.atlassian.jira.web.bean.I18nBean;
-import com.atlassian.jira.web.util.OutlookDate;
-import com.atlassian.jira.web.util.OutlookDateManager;
import com.opensymphony.user.User;
import java.sql.Timestamp;
-import org.apache.log4j.Logger;
-import org.ofbiz.core.entity.EntityOperator;
import com.atlassian.jira.plugin.report.ReportModuleDescriptor;
import com.atlassian.jira.plugin.globalreport.impl.AbstractGlobalReport;
import com.atlassian.jira.issue.action.ChangeHistory;
import org.ofbiz.core.entity.GenericValue;
import java.text.DateFormat;
-import com.atlassian.jira.web.action.admin.user.UserBrowser;
import java.util.*;
/**Report to generate number of resolved issues in projects for a given period
Modified: trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/table/header.jsp
===================================================================
--- trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/table/header.jsp 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/table/header.jsp 2005-08-27 17:52:21 UTC (rev 993)
@@ -31,7 +31,7 @@
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td valign="bottom" width=80%><b><webwork:text name="'navigator.results.currentview'"/>:</b><br>
- <webwork:if test="'bulk' != $view">
+ <webwork:if test="'bulk' != $view && 'rnotes' != $view">
<webwork:text name="'navigator.results.currentview.browser'"/>
</webwork:if>
<webwork:else>
Modified: trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp
===================================================================
--- trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 17:52:21 UTC (rev 993)
@@ -1,7 +1,7 @@
-<%@ page import="com.atlassian.jira.web.component.IssueTableLayoutBean,
- com.atlassian.jira.web.component.IssuePager,
+<%@ page import="com.atlassian.jira.web.component.IssuePager,
java.util.*,
org.ofbiz.core.entity.GenericValue,
+ com.atlassian.jira.issue.Issue,
com.atlassian.jira.ComponentManager,
com.atlassian.jira.issue.search.util.QueryCreator,
com.atlassian.jira.web.action.issue.IssueNavigator,
@@ -13,56 +13,50 @@
<%@ taglib uri="webwork" prefix="webwork" %>
<%@ taglib uri="sitemesh-page" prefix="page" %>
-<!-- JIRA PART -->
-
+<html>
+<head>
+ <title><webwork:if test="searchRequest/name">[<webwork:property value="searchRequest/name"/>] </webwork:if><webwork:text name="'navigator.title'"/></title>
+</head>
+<body>
<table border="0" cellpadding="0" cellspacing="0" width="100%" bgcolor="ffffff">
- <tr>
+<%-- remove for printable decorator --%>
+ <tr class="hidden">
<!-- This is here to get around a rendering problem on Mozilla which manifests when viewing the page
over a relatively slow connection. The filterform is rendered to take up more than half the page. By
givving a 'relative' row to the browser first we ensure that the rest of the rows are rendered similarly and
hence the width of the filterform column is fixed. Fixes JRA-5116 -->
<webwork:if test="/mode == 'show'">
- <td width="300" bgcolor="ffffff"></td>
+ <td class="filterFormCell"> </td>
</webwork:if>
<webwork:else>
- <td width="214" bgcolor="f0f0f0"></td>
+ <td class="filterSummaryCell"> </td>
</webwork:else>
- <td width="1"><img src="<webwork:url page="/images/border/spacer.gif"/>" height="1" width="1"></td>
- <td width="100%"></td>
+ <td> </td>
</tr>
<tr>
<webwork:if test="/mode == 'show'">
- <td width="300" valign="top" bgcolor="ffffff">
+ <td class="filterFormCell">
<jsp:include page="/includes/navigator/filter-form.jsp" flush="false" />
</td>
</webwork:if>
<webwork:else>
- <td width="214" valign="top" bgcolor="f0f0f0">
+ <td class="filterSummaryCell">
<jsp:include page="/includes/navigator/summary-pane.jsp" flush="false" />
</td>
</webwork:else>
- <td width="1" bgcolor="bbbbbb"><img src="<webwork:url page="/images/border/spacer.gif"/>" height="1" width="1"></td>
+<%-- end remove --%>
<td valign="top">
<table cellspacing="0" cellpadding="10" border="0" width="100%"><tr><td>
-
-<webwork:if test="/searchResults">
+
+<webwork:if test="/searchResults && /hasAnyErrors == false">
<jsp:include page="/includes/navigator/table/header.jsp"/>
</webwork:if>
-<webwork:else>
- <page:applyDecorator name="jirapanel">
- <page:param name="title"><webwork:property value="text('navigator.title')"/></page:param>
- <page:param name="width">100%</page:param>
- <p>
- <webwork:text name="'navigator.desc1'"/>
- </p>
- <p>
- <webwork:text name="'navigator.desc2'"/>
- </p>
- <jsp:include page="/includes/errormessages.jsp" />
- </page:applyDecorator>
-</webwork:else>
-
+
+<p>
+<webwork:if test="/hasErrorMessages == false && /hasErrors == false" >
+
+
<!-- JBoss part -->
<webwork:if test="/hasErrorMessages == false && /hasErrors == false" >
@@ -73,26 +67,47 @@
List issues = searchResults.getIssues();
TextUtils textUtils = new TextUtils();
+ final ConstantsManager constantsManager =
+ ComponentManager.getInstance().getConstantsManager();
+
Iterator iter;
/* Map: issue type id -> (Set of issue) */
- Map issuesMap = new TreeMap();
+ Map issuesMap = new TreeMap(new Comparator() {
+ // Sorting issue types by the "sequence" field.
+ public int compare(Object arg0, Object arg1) {
+ String id1 = (String) arg0;
+ String id2 = (String) arg1;
+
+ GenericValue gv1 = constantsManager.getIssueType(id1);
+ GenericValue gv2 = constantsManager.getIssueType(id2);
+
+ return gv1.getLong("sequence").compareTo(
+ gv2.getLong("sequence"));
+ }});
/* Map: issue type id -> issue name */
Map issuesNamesMap = new HashMap();
- List allIssueTypes = ComponentManager.getInstance().getConstantsManager().getAllIssueTypes();
+ List allIssueTypes = constantsManager.getAllIssueTypes();
for (iter = allIssueTypes.iterator(); iter.hasNext();) {
GenericValue issueType = (GenericValue)iter.next();
- issuesNamesMap.put(issueType.getString("id"), issueType.getString("name"));
- }
-
- /* Preparing issueMap */
+ issuesNamesMap.put(issueType.getString("id"), issueType.getString("name"));
+ }
+
+ /* Preparing issueMap */
for (iter = issuesNamesMap.keySet().iterator(); iter.hasNext();)
- issuesMap.put(iter.next(), new TreeSet());
-
+ issuesMap.put(iter.next(), new TreeSet(new Comparator() {
+ public int compare(Object o1, Object o2) {
+ Issue i1 = (Issue) o1;
+ Issue i2 = (Issue) o2;
+
+ return i1.getId().compareTo(i2.getId());
+ }
+ }));
+
/* Filling sets in issueMap */
for (iter = issues.iterator(); iter.hasNext();) {
- GenericValue issue = (GenericValue) iter.next();
- ((Set)issuesMap.get(issue.getString("type"))).add(issue);
+ Issue issue = (Issue) iter.next();
+ ((Set)issuesMap.get(issue.getIssueType().getString("id"))).add(issue);
}
for (iter = issuesMap.keySet().iterator(); iter.hasNext();) {
@@ -105,13 +120,13 @@
<ul>
<%
for (Iterator iter2 = currIssues.iterator(); iter2.hasNext();) {
- GenericValue issue = (GenericValue) iter2.next();
+ Issue issue = (Issue) iter2.next();
%>
<li>
- [ <a href="<%= request.getContextPath() %>/browse/<%= issue.getString("key") %>">
- <%= issue.getString("key") %>
+ [ <a href="<%= request.getContextPath() %>/browse/<%= issue.getKey() %>">
+ <%= issue.getKey() %>
</a> ]
- <%= textUtils.htmlEncode(issue.getString("summary")) %>
+ <%= textUtils.htmlEncode(issue.getSummary()) %>
</li>
<%
}
@@ -136,11 +151,11 @@
<%
for (Iterator iter2 = currIssues.iterator(); iter2.hasNext();) {
- GenericValue issue = (GenericValue) iter2.next();
+ Issue issue = (Issue) iter2.next();
%>
*
- [ <%= issue.getString("key") %> ]
- <%= textUtils.htmlEncode(issue.getString("summary")) %>
+ [ <%= issue.getKey() %> ]
+ <%= textUtils.htmlEncode(issue.getSummary()) %>
<br />
<%
}
@@ -151,7 +166,10 @@
</webwork:if>
<!-- JIRA PART -->
-
- </td></tr></table>
+</webwork:if>
+</p>
+ </td></tr></table>
</td></tr>
</table>
+</body>
+</html>
Modified: trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java
===================================================================
--- trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-27 17:52:21 UTC (rev 993)
@@ -40,7 +40,7 @@
Properties properties = new Properties();
try {
- properties.load(
+ properties.load(
AbstractJiraTest.class.getResourceAsStream("jira_tests.properties"));
adminLogin = properties.getProperty("adminLogin");
@@ -49,12 +49,12 @@
userPassword = properties.getProperty("userPassword");
host = properties.getProperty("host");
- /*adminLogin = "00testuser1";
+ adminLogin = "00testuser1";
adminPassword = "00TesTUseR1";
userLogin = "00testuser2";
userPassword = "00TesTUseR2";
host = "http://dev03.atl.jboss.com/jira/";
- adminLogin = "";
+ /*adminLogin = "adamw";
adminPassword = "adamw";
userLogin = "user1";
userPassword = "user1";
Modified: trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java
===================================================================
--- trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-27 17:52:21 UTC (rev 993)
@@ -17,11 +17,9 @@
private String issId1;
private String issRep1;
-
- private String issId2;
+
private String issRep2;
-
- private String issId3;
+
private String issRep3;
protected void setUp() throws Exception {
@@ -35,8 +33,8 @@
verId2 = addVersion(prjId, "ver2", "12-May-2005", false);
issId1 = addIssue(prjId, "1", "issue1", "3", new String[] { verId1, verId2 }, true);
- issId2 = addIssue(prjId, "2", "issue2", "2", new String[] { verId1 }, false);
- issId3 = addIssue(prjId, "3", "issue3", "1", new String[] { verId2 }, false);
+ addIssue(prjId, "2", "issue2", "2", new String[] { verId1 }, false);
+ addIssue(prjId, "3", "issue3", "1", new String[] { verId2 }, false);
issRep1 = getIssueRepresentation(prjId, "issue1");
issRep2 = getIssueRepresentation(prjId, "issue2");
Modified: trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java
===================================================================
--- trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-27 17:52:21 UTC (rev 993)
@@ -77,7 +77,8 @@
wr.setParameter("priorities", allPriorities);
wr.setParameter("period", "month");
wr.setParameter("style", "html");
- wr.setParameter("dateend", "31-Dec-2004");
+ wr.setParameter("datenow", "no");
+ wr.setParameter("datebegin", "01-Dec-2004");
wc.sendRequest(wr);
@@ -94,7 +95,8 @@
wr.setParameter("priorities", allPriorities);
wr.setParameter("period", "year");
wr.setParameter("style", "html");
- wr.setParameter("dateend", "31-Dec-2004");
+ wr.setParameter("datenow", "no");
+ wr.setParameter("datebegin", "01-Jan-2004");
wc.sendRequest(wr);
@@ -110,7 +112,8 @@
wr.setParameter("priorities", new String[] { "1", "3" });
wr.setParameter("period", "quarter");
wr.setParameter("style", "html");
- wr.setParameter("dateend", "01-Dec-2004");
+ wr.setParameter("datenow", "no");
+ wr.setParameter("datebegin", "01-Oct-2004");
wc.sendRequest(wr);
Modified: trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java
===================================================================
--- trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java 2005-08-27 17:52:21 UTC (rev 993)
@@ -16,10 +16,8 @@
private String prjId;
- private String issId1;
private String issRep1;
- private String issId2;
private String issRep2;
private String addVotingScheme(String name, String description) throws Exception {
@@ -99,7 +97,7 @@
prjId = addProject("TestProject1", "XXA", true);
- issId1 = addIssue(prjId, "1", "issue1", "1", new String[] {}, true);
+ addIssue(prjId, "1", "issue1", "1", new String[] {}, true);
issRep1 = getIssueRepresentation(prjId, "issue1");
vsIds = new String[2];
@@ -115,7 +113,7 @@
goToMainPage();
loginUser();
- issId2 = addIssue(prjId, "2", "issue2", "2", new String[] {}, false);
+ addIssue(prjId, "2", "issue2", "2", new String[] {}, false);
issRep2 = getIssueRepresentation(prjId, "issue2");
}
Modified: trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java
===================================================================
--- trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java 2005-08-27 17:52:21 UTC (rev 993)
@@ -32,261 +32,262 @@
*/
public class ReleaseNotesAffectReport extends AbstractReport
{
- private final SearchProvider searchProvider;
- private final ConstantsManager constantsManager;
- private final ApplicationProperties appProps;
- private final VersionManager verMan;
- private final CustomFieldManager customFieldManager;
- private final IssueManager issueManager;
-
- /**
- * <code>versions</code> - versions ids that match the users input
- */
- private Collection versions;
-
- public ReleaseNotesAffectReport(IssueManager issueManager, ApplicationProperties appProps, ConstantsManager constantsManager, SearchProvider searchProvider, CustomFieldManager customFieldManager)
- {
- this.issueManager = issueManager;
- this.searchProvider = searchProvider;
- this.constantsManager = constantsManager;
- this.appProps = appProps;
- this.verMan = ComponentManager.getInstance().getVersionManager();
- this.customFieldManager = customFieldManager;
+ private final SearchProvider searchProvider;
+ private final ConstantsManager constantsManager;
+ private final ApplicationProperties appProps;
+ private final VersionManager verMan;
+ private final CustomFieldManager customFieldManager;
+ private final IssueManager issueManager;
- versions = null;
- }
-
- /**
- * Performs a search with the given parameters to find issues to include in the release notes.
- * @param remoteUser
- * @param versions A collection of versions ids to include in the release notes.
- * @param sections A list of issue type ids to include in the relesae notes.
- * @return A collection of GenericEntity corresponding to the found issues.
- * @throws SearchException
- */
- private Collection issueSearch(User remoteUser, Collection versions, List sections) throws SearchException
- {
- SearchRequest sr = new SearchRequest(remoteUser);
- sr.addParameter(new FixForParameter(versions));
- sr.addParameter(new IssueTypeParameter(sections));
- return searchProvider.search(sr, remoteUser);
- }
-
-
- /**
- * Generates a list of issue types ids from user input to include in the release notes.
- * @param sections User input.
- * @return List of issue types ids
- */
- private List parseSections(String[] sections)
- {
- List l = new ArrayList();
- for (int i=0; i<sections.length; i++) {
- String[] subTypes = sections[i].split("[.]");
- for (int j=0; j<subTypes.length; j++)
- if (!subTypes[j].equals("")) l.add(subTypes[j]);
- }
- return l;
- }
-
- /**
- * Parses user input to generate a collection of matching version ids. Version to use when multi-select
- * boxes are enabled in to configuration of a report.
- * @param selectedVersions Version names template that were read from the user.
- * @return Collection of matching version ids.
- */
- private Collection parseVersions(String[] selectedVersions)
- {
- Set r = new TreeSet();
-
- for (int i=0; i<selectedVersions.length; i++)
- {
- long versionId = Long.parseLong(selectedVersions[i]);
- if (versionId > 0)
- r.add(new Long(versionId));
- }
-
- return r;
- }
-
- /**
- * Reads version parameters from the parameter map.
- * @param params
- * @return An array of strings holding version ids.
- */
- private String[] getVersionsFromParams(Map params)
- {
- String[] ret;
- try
- {
- ret = (String [])params.get("versions");
- } catch (ClassCastException e1)
- {
- try
- {
- ret = new String[1];
- ret[0] = (String)params.get("versions");
- } catch (ClassCastException e2)
- {
- return null;
- }
- }
-
- return ret;
- }
-
- /**
- * Reads selected sections from the parameter map.
- * @param params
- * @return An array of strings holding sections ids.
- */
- private String[] getSectionsFromParams(Map params)
- {
- String[] ret;
- try
- {
- ret = (String [])params.get("sections");
- } catch (ClassCastException e1)
- {
- try
- {
- ret = new String[1];
- ret[0] = (String)params.get("sections");
- } catch (ClassCastException e2)
- {
- return null;
- }
- }
-
- return ret;
- }
-
- /**
- * Parses user input and returns a collection of version ids that match the users' input.
- * @param action
- * @param params Parameters of this report.
- * @return Collection of version ids that match the users' input.
- * @throws PermissionException
- */
- private Collection getVersions(ProjectActionSupport action, Map params) throws PermissionException
- {
- if (versions == null)
- versions = parseVersions(getVersionsFromParams(params));
- return versions;
- }
-
- public String generateReportHtml(ProjectActionSupport action, Map params) throws Exception
- {
- User remoteUser = action.getRemoteUser();
- Map velocityParams = new HashMap();
-
- try
- {
- /* Generating parameters for search */
- Collection versions = getVersions(action, params);
- List sections = parseSections(getSectionsFromParams(params));
-
- /* Searching for issues to include in the report */
- Collection issues = issueSearch(remoteUser, versions, sections);
-
- Iterator iter;
- /* Map: issue type id -> (Set of issue) */
- Map issuesMap = new TreeMap();
- /* Map: issue type id -> issue name */
- Map issuesNamesMap = new HashMap();
-
- CustomField affects = customFieldManager.getCustomFieldObjectByName("Affects");
-
- Map affectsValues = new HashMap();
-
- Iterator it = issues.iterator();
-
- /* prepare affect values for each project */
- while (it.hasNext()) {
- Object key = it.next();
- String issueId = ((GenericValue)key).getString("id");
- String str = String.valueOf(affects.getValue(
- issueManager.getIssueObject(issueId)));
- if (!(str.equals("null")))
- affectsValues.put(key, str.substring(1,str.length() - 1));
- }
-
- /* Preparing issueMap */
- for (iter = sections.iterator(); iter.hasNext();)
- issuesMap.put(iter.next(), new TreeSet());
-
- /* Filling sets in issueMap */
- for (iter = issues.iterator(); iter.hasNext();) {
- GenericValue issue = (GenericValue) iter.next();
- ((Set)issuesMap.get(issue.getString("type"))).add(issue);
- }
-
- /* Setting the issues' names */
- for (iter = sections.iterator(); iter.hasNext();) {
- String issueId = (String)iter.next();
- issuesNamesMap.put(issueId, constantsManager.getIssueType(issueId).getString("name"));
- }
-
- /* Getting the project for which this report is - by looking at
- * a representative version. We know that at least one exists
- * because validation was passed. */
- Long repVer = (Long) versions.iterator().next();
- GenericValue project = verMan.getVersion(repVer).getProject();
-
- /* Preparing parameters for output */
- velocityParams.put("action", action);
- velocityParams.put("project", project);
- velocityParams.put("appProps", appProps);
- velocityParams.put("verMan", verMan);
- velocityParams.put("versions", versions);
- velocityParams.put("issuesMap", issuesMap);
- velocityParams.put("issuesNamesMap", issuesNamesMap);
- velocityParams.put("textUtils", new TextUtils());
- velocityParams.put("affectsVal", affectsValues);
-
- /* Generating release notes source in the format demanded by the user */
- String style = (String)params.get("style");
-
- if ("none".equals(style))
- velocityParams.put("generated", "");
- else
- velocityParams.put("generated",
- descriptor.getHtml(style, velocityParams));
- } catch (SearchException e)
- {
- return "";
- }
-
- return descriptor.getHtml("view", velocityParams);
- }
-
- public void validate(ProjectActionSupport action, Map params)
- {
- /* Checking if the versions field is not empty */
- String[] versions = getVersionsFromParams(params);
- if (versions == null || versions.length == 0)
- {
- action.addError("versions", action.getText("report.releasenotes-affect.versions.required"));
- return;
- }
-
- /* Checking if the sections field is not empty */
- String[] sections = getSectionsFromParams(params);
- if (sections == null || sections.length == 0)
- {
- action.addError("sections", action.getText("report.releasenotes-affect.sections.required"));
- return;
- }
-
- /* Checking if the versions field is not empty */
- try
- {
- if (getVersions(action, params).size() == 0)
- action.addError("versions", action.getText("report.releasenotes-affect.versions.nomatch"));
- } catch (PermissionException e)
- {
- action.addError("versions", action.getText("report.releasenotes-affect.versions.noperms"));
- }
-
- }
+ /**
+ * <code>versions</code> - versions ids that match the users input
+ */
+ private Collection versions;
+
+ public ReleaseNotesAffectReport(IssueManager issueManager, ApplicationProperties appProps, ConstantsManager constantsManager, SearchProvider searchProvider, CustomFieldManager customFieldManager)
+ {
+ this.issueManager = issueManager;
+ this.searchProvider = searchProvider;
+ this.constantsManager = constantsManager;
+ this.appProps = appProps;
+ this.verMan = ComponentManager.getInstance().getVersionManager();
+ this.customFieldManager = customFieldManager;
+
+ versions = null;
+ }
+
+ /**
+ * Performs a search with the given parameters to find issues to include in the release notes.
+ * @param remoteUser
+ * @param versions A collection of versions ids to include in the release notes.
+ * @param sections A list of issue type ids to include in the relesae notes.
+ * @return A collection of GenericEntity corresponding to the found issues.
+ * @throws SearchException
+ */
+ private Collection issueSearch(User remoteUser, Collection versions, List sections) throws SearchException
+ {
+ SearchRequest sr = new SearchRequest(remoteUser);
+ sr.addParameter(new FixForParameter(versions));
+ sr.addParameter(new IssueTypeParameter(sections));
+ return searchProvider.search(sr, remoteUser);
+ }
+
+
+ /**
+ * Generates a list of issue types ids from user input to include in the release notes.
+ * @param sections User input.
+ * @return List of issue types ids
+ */
+ private List parseSections(String[] sections)
+ {
+ List l = new ArrayList();
+ for (int i=0; i<sections.length; i++) {
+ String[] subTypes = sections[i].split("[.]");
+ for (int j=0; j<subTypes.length; j++)
+ if (!subTypes[j].equals("")) l.add(subTypes[j]);
+ }
+ return l;
+ }
+
+ /**
+ * Parses user input to generate a collection of matching version ids. Version to use when multi-select
+ * boxes are enabled in to configuration of a report.
+ * @param selectedVersions Version names template that were read from the user.
+ * @return Collection of matching version ids.
+ */
+ private Collection parseVersions(String[] selectedVersions)
+ {
+ Set r = new TreeSet();
+
+ for (int i=0; i<selectedVersions.length; i++)
+ {
+ long versionId = Long.parseLong(selectedVersions[i]);
+ if (versionId > 0)
+ r.add(new Long(versionId));
+ }
+
+ return r;
+ }
+
+ /**
+ * Reads version parameters from the parameter map.
+ * @param params
+ * @return An array of strings holding version ids.
+ */
+ private String[] getVersionsFromParams(Map params)
+ {
+ String[] ret;
+ try
+ {
+ ret = (String [])params.get("versions");
+ } catch (ClassCastException e1)
+ {
+ try
+ {
+ ret = new String[1];
+ ret[0] = (String)params.get("versions");
+ } catch (ClassCastException e2)
+ {
+ return null;
+ }
+ }
+
+ return ret;
+ }
+
+ /**
+ * Reads selected sections from the parameter map.
+ * @param params
+ * @return An array of strings holding sections ids.
+ */
+ private String[] getSectionsFromParams(Map params)
+ {
+ String[] ret;
+ try
+ {
+ ret = (String [])params.get("sections");
+ } catch (ClassCastException e1)
+ {
+ try
+ {
+ ret = new String[1];
+ ret[0] = (String)params.get("sections");
+ } catch (ClassCastException e2)
+ {
+ return null;
+ }
+ }
+
+ return ret;
+ }
+
+ /**
+ * Parses user input and returns a collection of version ids that match the users' input.
+ * @param action
+ * @param params Parameters of this report.
+ * @return Collection of version ids that match the users' input.
+ * @throws PermissionException
+ */
+ private Collection getVersions(ProjectActionSupport action, Map params) throws PermissionException
+ {
+ if (versions == null)
+ versions = parseVersions(getVersionsFromParams(params));
+ return versions;
+ }
+
+ public String generateReportHtml(ProjectActionSupport action, Map params) throws Exception
+ {
+ User remoteUser = action.getRemoteUser();
+ Map velocityParams = new HashMap();
+
+ try
+ {
+ /* Generating parameters for search */
+ Collection versions = getVersions(action, params);
+ List sections = parseSections(getSectionsFromParams(params));
+
+ /* Searching for issues to include in the report */
+ Collection issues = issueSearch(remoteUser, versions, sections);
+
+ Iterator iter;
+ /* Map: issue type id -> (Set of issue) */
+ Map issuesMap = new TreeMap();
+ /* Map: issue type id -> issue name */
+ Map issuesNamesMap = new HashMap();
+
+ CustomField affects = customFieldManager.getCustomFieldObjectByName("Affects");
+
+ Map affectsValues = new HashMap();
+
+ Iterator it = issues.iterator();
+
+ /* prepare affect values for each project */
+ if (affects != null)
+ while (it.hasNext()) {
+ Object key = it.next();
+ String issueId = ((GenericValue)key).getString("id");
+ String str = String.valueOf(affects.getValue(
+ issueManager.getIssueObject(issueId)));
+ if (!(str.equals("null")))
+ affectsValues.put(key, str.substring(1,str.length() - 1));
+ }
+
+ /* Preparing issueMap */
+ for (iter = sections.iterator(); iter.hasNext();)
+ issuesMap.put(iter.next(), new TreeSet());
+
+ /* Filling sets in issueMap */
+ for (iter = issues.iterator(); iter.hasNext();) {
+ GenericValue issue = (GenericValue) iter.next();
+ ((Set)issuesMap.get(issue.getString("type"))).add(issue);
+ }
+
+ /* Setting the issues' names */
+ for (iter = sections.iterator(); iter.hasNext();) {
+ String issueId = (String)iter.next();
+ issuesNamesMap.put(issueId, constantsManager.getIssueType(issueId).getString("name"));
+ }
+
+ /* Getting the project for which this report is - by looking at
+ * a representative version. We know that at least one exists
+ * because validation was passed. */
+ Long repVer = (Long) versions.iterator().next();
+ GenericValue project = verMan.getVersion(repVer).getProject();
+
+ /* Preparing parameters for output */
+ velocityParams.put("action", action);
+ velocityParams.put("project", project);
+ velocityParams.put("appProps", appProps);
+ velocityParams.put("verMan", verMan);
+ velocityParams.put("versions", versions);
+ velocityParams.put("issuesMap", issuesMap);
+ velocityParams.put("issuesNamesMap", issuesNamesMap);
+ velocityParams.put("textUtils", new TextUtils());
+ velocityParams.put("affectsVal", affectsValues);
+
+ /* Generating release notes source in the format demanded by the user */
+ String style = (String)params.get("style");
+
+ if ("none".equals(style))
+ velocityParams.put("generated", "");
+ else
+ velocityParams.put("generated",
+ descriptor.getHtml(style, velocityParams));
+ } catch (SearchException e)
+ {
+ return "";
+ }
+
+ return descriptor.getHtml("view", velocityParams);
+ }
+
+ public void validate(ProjectActionSupport action, Map params)
+ {
+ /* Checking if the versions field is not empty */
+ String[] versions = getVersionsFromParams(params);
+ if (versions == null || versions.length == 0)
+ {
+ action.addError("versions", action.getText("report.releasenotes-affect.versions.required"));
+ return;
+ }
+
+ /* Checking if the sections field is not empty */
+ String[] sections = getSectionsFromParams(params);
+ if (sections == null || sections.length == 0)
+ {
+ action.addError("sections", action.getText("report.releasenotes-affect.sections.required"));
+ return;
+ }
+
+ /* Checking if the versions field is not empty */
+ try
+ {
+ if (getVersions(action, params).size() == 0)
+ action.addError("versions", action.getText("report.releasenotes-affect.versions.nomatch"));
+ } catch (PermissionException e)
+ {
+ action.addError("versions", action.getText("report.releasenotes-affect.versions.noperms"));
+ }
+
+ }
}
Modified: trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java
===================================================================
--- trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java 2005-08-27 17:52:21 UTC (rev 993)
@@ -190,7 +190,19 @@
Iterator iter;
/* Map: issue type id -> (Set of issue) */
- Map issuesMap = new TreeMap();
+ Map issuesMap = new TreeMap(new Comparator() {
+ // Sorting issue types by the "sequence" field.
+ public int compare(Object arg0, Object arg1) {
+ String id1 = (String) arg0;
+ String id2 = (String) arg1;
+
+ GenericValue gv1 = constantsManager.getIssueType(id1);
+ GenericValue gv2 = constantsManager.getIssueType(id2);
+
+ return gv1.getLong("sequence").compareTo(
+ gv2.getLong("sequence"));
+ }
+ });
/* Map: issue type id -> issue name */
Map issuesNamesMap = new HashMap();
@@ -209,7 +221,7 @@
String issueId = (String)iter.next();
issuesNamesMap.put(issueId, constantsManager.getIssueType(issueId).getString("name"));
}
-
+
/* Preparing parameters for output */
velocityParams.put("project", project);
velocityParams.put("action", action);
Modified: trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml
===================================================================
--- trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 17:52:21 UTC (rev 993)
@@ -38,6 +38,28 @@
<values class="pl.net.mamut.jira.IssuesPrioritiesValueGenerator" />
</property>
<property>
+ <key>datebegin</key>
+ <name>report.roadmap.datebegin.name</name>
+ <description>report.roadmap.datebegin.description</description>
+ <type>date</type>
+ </property>
+ <property>
+ <key>datenow</key>
+ <name>report.roadmap.datenow.name</name>
+ <description>report.roadmap.datenow.description</description>
+ <type>select</type>
+ <values>
+ <value>
+ <key>no</key>
+ <value>No</value>
+ </value>
+ <value>
+ <key>yes</key>
+ <value>Yes</value>
+ </value>
+ </values>
+ </property>
+ <property>
<key>period</key>
<name>report.roadmap.period.name</name>
<description>report.roadmap.period.description</description>
@@ -58,12 +80,6 @@
</values>
</property>
<property>
- <key>dateend</key>
- <name>report.roadmap.dateend.name</name>
- <description>report.roadmap.dateend.description</description>
- <type>date</type>
- </property>
- <property>
<key>style</key>
<name>report.roadmap.style.name</name>
<description>report.roadmap.style.description</description>
Modified: trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties
===================================================================
--- trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties 2005-08-27 17:52:21 UTC (rev 993)
@@ -13,9 +13,12 @@
report.roadmap.period.name = Period covered
report.roadmap.period.description = Select the span of time that this report will cover
report.roadmap.period.error = Please select one period.
-report.roadmap.dateend.name = End date
-report.roadmap.dateend.description = Select the date that ends the period of time you chose.
-report.roadmap.dateend.error = Please select a date.
+report.roadmap.datebegin.name = Begin date
+report.roadmap.datebegin.description = Select the date that begins the period of time you chose.
+report.roadmap.datebegin.error = Please select a date.
+report.roadmap.datenow.name = Today
+report.roadmap.datenow.description = Check this box if you want the report's starting date to be today.
+report.roadmap.datenow.error = Please select either yes or no.
report.roadmap.style.name = Style
report.roadmap.style.description = Select the style in which to generate the report source.
report.roadmap.style.error = Please select one style.
\ No newline at end of file
Modified: trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java
===================================================================
--- trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 09:55:01 UTC (rev 992)
+++ trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 17:52:21 UTC (rev 993)
@@ -5,7 +5,9 @@
package pl.net.mamut.jira;
import com.atlassian.jira.config.ConstantsManager;
+import com.atlassian.jira.config.SubTaskManager;
import com.atlassian.jira.config.properties.ApplicationProperties;
+import com.atlassian.jira.issue.IssueImpl;
import com.atlassian.jira.issue.IssueManager;
import com.atlassian.jira.issue.search.SearchException;
import com.atlassian.jira.issue.search.SearchProvider;
@@ -14,6 +16,7 @@
import com.atlassian.jira.issue.search.parameters.lucene.IssueTypeParameter;
import com.atlassian.jira.issue.search.parameters.lucene.PriorityParameter;
import com.atlassian.jira.issue.search.parameters.lucene.ProjectParameter;
+import com.atlassian.jira.issue.security.IssueSecurityLevelManager;
import com.atlassian.jira.plugin.globalreport.impl.AbstractGlobalReport;
import com.atlassian.jira.plugin.report.ReportModuleDescriptor;
import com.atlassian.jira.project.ProjectManager;
@@ -43,7 +46,6 @@
public class RoadmapGlobalReport extends AbstractGlobalReport
{
private final SearchProvider searchProvider;
- private final IssueManager issueManager;
private final ConstantsManager constantsManager;
private final ApplicationProperties appProps;
private final OutlookDateManager outlookDateManager;
@@ -51,21 +53,28 @@
private final VersionManager versionManager;
private final PermissionManager permissionManager;
private final PluginManager pluginManager;
+ private final IssueManager issueManager;
+ private final SubTaskManager subTaskManager;
+ private final IssueSecurityLevelManager issueSecurityLevelManager;
public RoadmapGlobalReport(OutlookDateManager outlookDateManager, ApplicationProperties appProps,
- ConstantsManager constantsManager, SearchProvider searchProvider, IssueManager issueManager,
+ ConstantsManager constantsManager, SearchProvider searchProvider,
ProjectManager projectManager, VersionManager versionManager, PermissionManager permissionManager,
- PluginManager pluginManager)
+ PluginManager pluginManager, IssueManager issueManager,
+ SubTaskManager subTaskManager,
+ IssueSecurityLevelManager issueSecurityLevelManager)
{
this.outlookDateManager = outlookDateManager;
this.searchProvider = searchProvider;
- this.issueManager = issueManager;
this.constantsManager = constantsManager;
this.appProps = appProps;
this.projectManager = projectManager;
this.versionManager = versionManager;
this.permissionManager = permissionManager;
this.pluginManager = pluginManager;
+ this.issueManager = issueManager;
+ this.subTaskManager = subTaskManager;
+ this.issueSecurityLevelManager = issueSecurityLevelManager;
}
/**
@@ -87,7 +96,18 @@
sr.addParameter(new IssueTypeParameter(sections));
sr.addParameter(new PriorityParameter(priorities));
sr.addParameter(new ProjectParameter(projectId));
- return searchProvider.search(sr, remoteUser);
+ // Converting the list of issues represented by generic values
+ // to a list of wrappers.
+ List gvIssues = searchProvider.search(sr, remoteUser);
+ List wrIssues = new ArrayList();
+
+ for (Iterator iter = gvIssues.iterator(); iter.hasNext();)
+ wrIssues.add(new IssueImpl((GenericValue) iter.next(),
+ issueManager, projectManager, versionManager,
+ issueSecurityLevelManager, constantsManager,
+ subTaskManager));
+
+ return wrIssues;
}
/**
@@ -95,14 +115,13 @@
* @param cal
* @param n Number of months
*/
- private void nMonthsBack(Calendar cal, int n) {
- int day = cal.get(Calendar.DAY_OF_MONTH);
+ private void nMonthsForward(Calendar cal, int n) {
int month = cal.get(Calendar.MONTH);
int year = cal.get(Calendar.YEAR);
-
- month -= n; if (month < 0) {
- month += 12;
- cal.set(Calendar.YEAR, cal.get(Calendar.YEAR)-1);
+
+ month += n-1; if (month > 11) {
+ month -= 12;
+ cal.set(Calendar.YEAR, cal.get(Calendar.YEAR)+1);
}
cal.set(Calendar.MONTH, month);
switch(month)
@@ -123,20 +142,18 @@
* @param endDate Date that ends the period.
* @return Date that begins the period.
*/
- private Date getBeginDate(String period, Date endDate)
+ private Date getEndDate(String period, Date endDate)
{
Calendar cal = Calendar.getInstance();
cal.setTime(endDate);
if (period.equals("month"))
- nMonthsBack(cal, 1);
+ nMonthsForward(cal, 1);
else if (period.equals("quarter"))
- nMonthsBack(cal, 3);
+ nMonthsForward(cal, 3);
else if (period.equals("year"))
- nMonthsBack(cal, 12);
-
- cal.set(Calendar.DAY_OF_YEAR, cal.get(Calendar.DAY_OF_YEAR)+1);
-
+ nMonthsForward(cal, 12);
+
return cal.getTime();
}
@@ -173,8 +190,12 @@
/* Geting the dates */
I18nHelper i18nBean = new I18nBean(remoteUser);
- Date endDate = ParameterUtils.getDateParam(params, "dateend", i18nBean.getLocale());
- Date beginDate = getBeginDate((String)params.get("period"), endDate);
+ Date beginDate;
+ if (("yes".equals((String) params.get("datenow"))))
+ beginDate = Calendar.getInstance().getTime();
+ else
+ beginDate = ParameterUtils.getDateParam(params, "datebegin", i18nBean.getLocale());
+ Date endDate = getEndDate((String)params.get("period"), beginDate);
/* Getting the types */
String[] types = getMultiselectValue(params, "types");
@@ -309,33 +330,19 @@
if (!validateMultivalue(action, params, "priorities")) return;
if (!validateSinglevalue(action, params, "period")) return;
if (!validateSinglevalue(action, params, "style")) return;
+ if (!validateSinglevalue(action, params, "datenow")) return;
- Date endDate = ParameterUtils.getDateParam(params, "dateend", i18nBean.getLocale());
- OutlookDate outlookDate = outlookDateManager.getOutlookDate(i18nBean.getLocale());
- if (endDate == null || outlookDate.isDatePickerDate(outlookDate.formatDMY(endDate)))
- {
- action.addError("dateend", action.getText("report.roadmap.dateend.error"));
- return;
+ String dateNow = (String) params.get("datenow");
+ if (!("yes".equals(dateNow))) {
+ Date beginDate = ParameterUtils.getDateParam(params, "datebegin", i18nBean.getLocale());
+ OutlookDate outlookDate = outlookDateManager.getOutlookDate(i18nBean.getLocale());
+ if (beginDate == null || outlookDate.isDatePickerDate(outlookDate.formatDMY(beginDate)))
+ {
+ action.addError("datebegin", action.getText("report.roadmap.datebegin.error"));
+ return;
+ }
}
}
public void init(ReportModuleDescriptor arg0) { }
-}
-
-/*
-
-$browser.setSelectedProjectId($project.getLong("id"))
-<td bgcolor="fffff0" colspan=3>
- <table height=6 width=180 valign=middle align=right cellspacing=0 cellpadding=0 border=0>
- <tr height=6>
- <td width="80" valign="middle" align="right"><span class="subText">Progress: </span></td>
- #percentageGraph ($browser.getIssueSummaryByFixForVersion($version) $project $version)
- </tr>
- #if ($browser.getIssuesByFixForVersion($version).size...
[truncated message content] |
|
From: <jbo...@li...> - 2005-08-27 09:55:07
|
Author: adamw
Date: 2005-08-27 05:55:01 -0400 (Sat, 27 Aug 2005)
New Revision: 992
Modified:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
Log:
Blog fix
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-08-27 08:59:49 UTC (rev 991)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-08-27 09:55:01 UTC (rev 992)
@@ -93,7 +93,10 @@
.getServerName());
feedAddress = replaceProperty(feedAddress, "${host.port}", Integer
.toString(request.getServerPort()));
- feedAddress = replaceProperty(feedAddress, "${project.name}", projectId);
+ if (projectId != null)
+ feedAddress = replaceProperty(feedAddress, "${project.name}", projectId);
+ else
+ feedAddress = replaceProperty(feedAddress, "${project.name}", "default");
feedAddress = replaceProperty(feedAddress, "${portal.name}", portalName);
feedAddress = replaceProperty(feedAddress, "${feed.type}", "atom");
@@ -135,13 +138,11 @@
int fromEntry = Integer.parseInt(fromEntryString);
String cacheKey = AbstractBlog.class.getName()+"/"+projectId;
- System.out.println("BLOG ID: " + projectId);
SyndFeed feed = (SyndFeed) forgeHelper.getForgeManagement().getFromCache(
portalName, cacheKey);
if (feed == null) {
- System.out.println("TO CACHE: " + cacheKey);
feed = (SyndFeed) forgeHelper.getForgeManagement().
addNodeWatcher(portalName, cacheKey,
new BlogNodeWatcher(feedAddress));
@@ -312,27 +313,4 @@
return found;
}
-
- /**
- * Item of the cache
- */
- class CacheItem {
- private long time;
-
- private SyndFeed feed;
-
- CacheItem(long time, SyndFeed feed) {
- this.time = time;
- this.feed = feed;
- }
-
- long getTime() {
- return time;
- }
-
- SyndFeed getFeed() {
- return feed;
- }
-
- }
}
\ No newline at end of file
|
|
From: <jbo...@li...> - 2005-08-27 08:59:53
|
Author: adamw
Date: 2005-08-27 04:59:49 -0400 (Sat, 27 Aug 2005)
New Revision: 991
Modified:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
Log:
Blog test
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-08-27 02:56:45 UTC (rev 990)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-08-27 08:59:49 UTC (rev 991)
@@ -133,13 +133,17 @@
// Now we are sure that fromEntryString has the value that was given to
// us in the address
int fromEntry = Integer.parseInt(fromEntryString);
-
+
+ String cacheKey = AbstractBlog.class.getName()+"/"+projectId;
+ System.out.println("BLOG ID: " + projectId);
+
SyndFeed feed = (SyndFeed) forgeHelper.getForgeManagement().getFromCache(
- portalName, AbstractBlog.class.getName());
+ portalName, cacheKey);
if (feed == null) {
+ System.out.println("TO CACHE: " + cacheKey);
feed = (SyndFeed) forgeHelper.getForgeManagement().
- addNodeWatcher(portalName, AbstractBlog.class.getName(),
+ addNodeWatcher(portalName, cacheKey,
new BlogNodeWatcher(feedAddress));
}
|
|
From: Mail D. S. <Mai...@co...> - 2005-08-27 03:10:06
|
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:
jbo...@li...
SMTP error from remote mailer after end of data:
host 64.74.196.135 [64.74.196.135]: 552 5.6.0 Headers too large (32768 max)
------ This is a copy of the message, including all the headers. ------
------ The body of the message is 16851737 characters long; only the first
------ 106496 or so are included here.
Return-path: <jbo...@li...>
Received: from www-data by committer01.frg.pub.inap.atl.jboss.com with local (Exim 4.50)
id 1E8r4r-0002k2-Ic
for jbo...@li...; Fri, 26 Aug 2005 23:09:55 -0400
To: jbo...@li...
From: jbo...@li...
Subject: JBL Code SVN: r990 - in prod/forge/portal-extensions: . binaries/maven-repo-addons/jboss/jars binaries/maven-repo-addons/tmate/jars blojsom federation-register federation-register/src/java/org/jboss/forge federation-register/src/web/WEB-INF forge-ads forge-blog forge-common forge-common/src/etc/org/jboss/forge/common forge-common/src/java/org/jboss/forge/common forge-common/src/java/org/jboss/forge/common/blog forge-common/src/java/org/jboss/forge/common/content forge-common/src/java/org/jboss/forge/common/portlet forge-common/src/java/org/jboss/forge/common/projects forge-common/src/java/org/jboss/forge/common/projects/elements forge-common/src/java/org/jboss/forge/common/service forge-common/src/java/org/jboss/forge/common/taglib forge-common/src/web/WEB-INF/tld forge-contributor forge-contributor/src forge-contributor/src/etc forge-contributor/src/java/org/jboss/forge/contributor forge-contributor/src/web/WEB-INF forge-contributor/src/web/WEB-INF/tld forge-ear f!
orge-ear/src forge-ear/src/META-INF forge-file-access forge-file-access/src forge-file-access/src/etc forge-file-access/src/java/org/jboss/forge/fileaccess forge-file-access/src/web/WEB-INF forge-file-access/src/web/WEB-INF/tld forge-forums forge-forums/to-copy forge-forums/to-copy/portal-forums.ear forge-forums/to-copy/portal-forums.ear/META-INF forge-forums/to-copy/portal-forums.ear/portal-forums.sar forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl forge-info!
forge-jspwiki forge-login forge-map forge-navigation forge-navigation
/src/java/org/jbosslabs/portlet/navigation forge-navigation/src/web/WEB-INF forge-portal-attr forge-portal-attr/src forge-portal-attr/src/java forge-portal-attr/src/java/org forge-portal-attr/src/java/org/jboss forge-portal-attr/src/java/org/jboss/forge forge-portal-attr/src/java/org/jboss/forge/portal forge-portal-attr/to-copy forge-portal-attr/to-copy/jboss-portal.sar forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF forge-prj-blog forge-prj-docs forge-prj-docs/src/java/org/jboss/forge/projects/docs forge-prj-downloads forge-prj-freezone forge-prj-freezone/src/java/org/jboss/forge/projects/freezone forge-prj-info forge-root-redirect forge-root-redirect/src/web/WEB-INF forge-root-redirect/src/web/WEB-INF/tld forge-service forge-service/src forge-service/src/java forge-service/src/java/org forge-service/src/java/org/jboss forge-service/src/java/org/jboss/forge forge-service/src/java/org/jboss/for!
ge/service forge-theme forge-theme/jbossForgeLayout.war forge-wiki forge-wiki/data forge-wiki/docs forge-wiki/src forge-wiki/src/etc forge-wiki/src/etc/org forge-wiki/src/etc/org/jboss forge-wiki/src/etc/org/jboss/wiki forge-wiki/src/etc/org/jboss/wiki/fileaccess forge-wiki/src/java forge-wiki/src/java/bmsi forge-wiki/src/java/bmsi/util forge-wiki/src/java/org forge-wiki/src/java/org/apache forge-wiki/src/java/org/apache/commons forge-wiki/src/java/org/apache/commons/fileupload forge-wiki/src/java/org/jboss forge-wiki/src/java/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki/fileaccess forge-wiki/src/java/org/jboss/wiki/plugins forge-wiki/src/test forge-wiki/src/test/java forge-wiki/src/test/java/org forge-wiki/src/test/java/org/jboss forge-wiki/src/test/java/org/jboss/wiki forge-wiki/src/test/java/org/jboss/wiki/test forge-wiki/src/web forge-wiki/src/web/WEB-INF forge-wiki/src/web/WEB-INF/jsp forge-wiki/src/web/WEB-INF/tld jboss-as-binaries jboss-as-binaries/to-copy jboss!
-as-binaries/to-copy/bin jboss-as-binaries/to-copy/client jboss-as-bin
aries/to-copy/docs jboss-as-binaries/to-copy/docs/dtd jboss-as-binaries/to-copy/docs/examples jboss-as-binaries/to-copy/docs/examples/binding-manager jboss-as-binaries/to-copy/docs/examples/jboss.net jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/META-INF jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jboss-net.war jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jboss-net.war/META-INF jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jboss-net.war/WEB-INF jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jboss-net.war/images jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jmx-net.wsr jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jmx-net.wsr/META-INF jboss-as-binaries/to-copy/docs/examples/jca jboss-as-binaries/to-copy/docs/examples/jms jboss-as-binaries/to-copy/docs/examples/jms/conf jboss-as-binaries/!
to-copy/docs/examples/jms/standalone jboss-as-binaries/to-copy/docs/examples/jmx jboss-as-binaries/to-copy/docs/examples/jmx/logging-monitor jboss-as-binaries/to-copy/docs/examples/jmx/logging-monitor/deploy jboss-as-binaries/to-copy/docs/examples/jmx/logging-monitor/lib jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/META-INF jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/org jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/org/jboss jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/org/jboss/jmx jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/org/jboss/jmx/examples jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/org/jboss/jmx/examples/persistence jboss-as-binaries/to-copy/docs/examples/media jboss-as-binaries/to-copy/docs/examples/netboot jboss-as-binaries/to-copy/docs/examples/varia jboss-as-bin!
aries/to-copy/docs/examples/varia/deployment-service jboss-as-binaries
/to-copy/docs/examples/varia/deployment-service/schema jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/jms-queue jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/jms-queue/vm jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/local-tx-datasource jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/local-tx-datasource/vm jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/no-tx-datasource jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/no-tx-datasource/vm jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/xa-datasource jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/xa-datasource/vm jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbal!
ancer.sar jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/META-INF jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/loadbalancer.war jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/loadbalancer.war/META-INF jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/loadbalancer.war/WEB-INF jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jboss jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jboss/web jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jboss/web/loadbalancer jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jboss/web/loadbalancer/monitor jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jboss/web/loadbalancer/scheduler jboss-as-binar!
ies/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jbos
s/web/loadbalancer/util jboss-as-binaries/to-copy/docs/licenses jboss-as-binaries/to-copy/docs/schema jboss-as-binaries/to-copy/docs/tests jboss-as-binaries/to-copy/docs/tests/org jboss-as-binaries/to-copy/docs/tests/org/jboss jboss-as-binaries/to-copy/docs/tests/org/jboss/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/aop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/aop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bank jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bank/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bankiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bankiiop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/binding jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bmp jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bmp/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/bean jboss-as-binaries/to-copy/docs/tests/org/jboss/te!
st/cache/stress jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/test/aop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/test/eviction jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/test/generic jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/test/local jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/test/replicated jboss-as-binaries/to-copy/docs/tests/org/jboss/test/classloader jboss-as-binaries/to-copy/docs/tests/org/jboss/test/classloader/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/client jboss-as-binaries/to-copy/docs/tests/org/jboss/test/client/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cluster jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cluster/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/audit jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp!
2/audit/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/
batchcascadedelete jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/batchcascadedelete/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cacheinvalidation jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cacheinvalidation/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmr jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmr/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmrstress jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmrtransaction jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmrtransaction/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmrtree jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmrtree/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/commerce jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/dbschema jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/dbschema/relationship jboss-as-binaries/to-copy/docs/tests/org/jbos!
s/test/cmp2/ejbselect jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/enums jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/enums/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/fkmapping jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/fkmapping/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/fkstackoverflow jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/fkstackoverflow/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/idxandusersql jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/idxandusersql/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/keygen jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/keygen/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/lob jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/optimisticlock jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/optimisticlock/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp!
2/passivation jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2
/passivation/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/perf jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/perf/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/readonly jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/relationship jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/simple jboss-as-binaries/to-copy/docs/tests/org/jboss/test/compatibility jboss-as-binaries/to-copy/docs/tests/org/jboss/test/compatibility/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cts jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cts/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/dbtest jboss-as-binaries/to-copy/docs/tests/org/jboss/test/dbtest/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deadlock jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deadlock/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/client jboss-a!
s-binaries/to-copy/docs/tests/org/jboss/test/deployers/client/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/ear jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/ear/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/ejb jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/ejb/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/rar jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/rar/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/sar jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/sar/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/web jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/web/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ejbconf jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ejbconf/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/entity jboss-as-binaries/to-copy/docs/tests/org/jboss/test/!
entity/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/entity
exc jboss-as-binaries/to-copy/docs/tests/org/jboss/test/entityexc/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/excepiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/excepiiop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/exception jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha/farm jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha/farm/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha/jmx jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha/jmx/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha/singleton jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha/singleton/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/hello jboss-as-binaries/to-copy/docs/tests/org/jboss/test/hello/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/helloiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/helloiiop/test jboss-as-binaries/to-copy/docs/tests/or!
g/jboss/test/hellojrmpiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/hellojrmpiiop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/hibernate jboss-as-binaries/to-copy/docs/tests/org/jboss/test/hibernate/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/idgen jboss-as-binaries/to-copy/docs/tests/org/jboss/test/idgen/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/iiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/iiop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/invokers jboss-as-binaries/to-copy/docs/tests/org/jboss/test/invokers/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/isolation jboss-as-binaries/to-copy/docs/tests/org/jboss/test/isolation/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jacc jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jacc/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jaxr jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jaxr/scout jboss-as-binaries/to-copy/!
docs/tests/org/jboss/test/jaxr/scout/basic jboss-as-binaries/to-copy/d
ocs/tests/org/jboss/test/jaxr/scout/publish jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jaxr/scout/publish/infomodel jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jaxr/scout/query jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jaxr/scout/query/infomodel jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmq jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmq/perf jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmq/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/modelmbean jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/monitor jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/notcompliant jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/objectname jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/complian!
ce/registration jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/relation jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/server jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/standard jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/timer jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/implementation jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/implementation/persistence jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/implementation/server jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/implementation/util jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/performance jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/performance/dynamic jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/performance/standard jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jca jboss-as-binaries/to-copy/docs/tests/org/jbo!
ss/test/jca/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/j
msra jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jmsra/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jmx jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jmx/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jrmp jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jrmp/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/kernel jboss-as-binaries/to-copy/docs/tests/org/jboss/test/kernel/deployment jboss-as-binaries/to-copy/docs/tests/org/jboss/test/kernel/deployment/jboss jboss-as-binaries/to-copy/docs/tests/org/jboss/test/kernel/deployment/jboss/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/lock jboss-as-binaries/to-copy/docs/tests/org/jboss/test/lock/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/management jboss-as-binaries/to-copy/docs/tests/org/jboss/test/management/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/mdb jboss-as-binaries/to-copy/docs/tests/org/jboss/test/mdb/test jboss-as-binaries/to-copy/docs/t!
ests/org/jboss/test/messagedriven jboss-as-binaries/to-copy/docs/tests/org/jboss/test/messagedriven/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/naming jboss-as-binaries/to-copy/docs/tests/org/jboss/test/naming/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/perf jboss-as-binaries/to-copy/docs/tests/org/jboss/test/perf/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/pooled jboss-as-binaries/to-copy/docs/tests/org/jboss/test/pooled/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/proxycompiler jboss-as-binaries/to-copy/docs/tests/org/jboss/test/proxycompiler/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/readahead jboss-as-binaries/to-copy/docs/tests/org/jboss/test/readahead/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/retry jboss-as-binaries/to-copy/docs/tests/org/jboss/test/retry/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/security jboss-as-binaries/to-copy/docs/tests/org/jboss/test/security/test jbos!
s-as-binaries/to-copy/docs/tests/org/jboss/test/securitymgr jboss-as-b
inaries/to-copy/docs/tests/org/jboss/test/securitymgr/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/testbean jboss-as-binaries/to-copy/docs/tests/org/jboss/test/testbean/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/testbeancluster jboss-as-binaries/to-copy/docs/tests/org/jboss/test/testbeancluster/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/testbyvalue jboss-as-binaries/to-copy/docs/tests/org/jboss/test/testbyvalue/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/timer jboss-as-binaries/to-copy/docs/tests/org/jboss/test/timer/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/tm jboss-as-binaries/to-copy/docs/tests/org/jboss/test/tm/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/txiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/txiiop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/txpropiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/txpropiiop/test jboss-as-binaries/to-copy/docs/tests/or!
g/jboss/test/txtimer jboss-as-binaries/to-copy/docs/tests/org/jboss/test/txtimer/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/util jboss-as-binaries/to-copy/docs/tests/org/jboss/test/util/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/web jboss-as-binaries/to-copy/docs/tests/org/jboss/test/web/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/web/test/ssl jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/addressrewrite jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/admindevel jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/attachment jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/attachmentstepbystep jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/encstyle jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/exception jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/handlerflow jboss-as!
-binaries/to-copy/docs/tests/org/jboss/test/webservice/header jboss-as
-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbas897 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws124 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws128 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws153 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws163 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws165 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws167 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws168 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws217 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws309 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws64 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws68 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws70 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws71 jboss-a!
s-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws79 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws82 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws83 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws84 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/marshalltest jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/message jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/samples jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/samples2 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/secure jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/ws4eesimple jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/wsdlimport jboss-as-binaries/to-copy/docs/tests/org/objectweb jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms jboss-as-binaries/to-copy/docs/test!
s/org/objectweb/jtests/jms/conform jboss-as-binaries/to-copy/docs/test
s/org/objectweb/jtests/jms/conform/connection jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/message jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/message/headers jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/message/properties jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/queue jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/selector jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/session jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/topic jboss-as-binaries/to-copy/lib jboss-as-binaries/to-copy/lib/endorsed jboss-as-binaries/to-copy/server jboss-as-binaries/to-copy/server/all jboss-as-binaries/to-copy/server/all/conf jboss-as-binaries/to-copy/server/all/conf/props jboss-as-binaries/to-copy/server/all/conf/xmdesc jboss-as-binaries/to-copy/server/all/deploy jboss-as-binaries/to-copy/server/all/deploy/deploy.last jbo!
ss-as-binaries/to-copy/server/all/deploy/ejb3.deployer jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/classes jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/classes/org/jboss/invocation jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/classes/org/jboss/invocation/http jboss-as-binaries/to-copy/server/all/deploy/httpha-invoke!
r.sar/invoker.war/WEB-INF/classes/org/jboss/invocation/http/servlet jb
oss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF jboss-as-binaries/to-copy/server/all/deploy/jboss-bean.deployer jboss-as-binaries/to-copy/server/all/deploy/jboss-bean.deployer/META-INF jboss-as-binaries/to-copy/server/all/deploy/jboss-hibernate.deployer jboss-as-binaries/to-copy/server/all/deploy/jboss-hibernate.deployer/META-INF jboss-as-binaries/to-copy/server/all/deploy/jboss-ws4ee.sar jboss-as-binaries/to-copy/server/all/deploy/jboss-ws4ee.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.sar jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.sar/ROOT.war jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.sar/ROOT.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.sar/ROOT.war/manager jboss-as-binaries/to-copy/server/all/deploy/jboss!
web-tomcat55.sar/conf jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.sar/jsf-libs jboss-as-binaries/to-copy/server/all/deploy/jms jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/META-INF jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor/control jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor/html jboss-a!
s-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/o
rg/jboss/jmx/adaptor/model jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/cluster jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/images jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/META-INF/ddl jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/META-INF jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF/classes jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF/classes/org/jb!
oss/jaxr jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF/classes/org/jboss/jaxr/juddi jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF/lib jboss-as-binaries/to-copy/server/all/deploy/management jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war/META-INF jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF/tlds jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war/css jbos!
s-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web
-console.war/images jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war/img jboss-as-binaries/to-copy/server/all/deploy/snmp-adaptor.sar jboss-as-binaries/to-copy/server/all/deploy/snmp-adaptor.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy-hasingleton jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/META-INF jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes jboss-as-binaries/to-copy/server/all/de!
ploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il/http jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il/http/servlet jboss-as-binaries/to-copy/server/all/farm jboss-as-binaries/to-copy/server/all/lib jboss-as-binaries/to-copy/server/default jboss-as-binaries/to-copy/server/default/conf jboss-as-binaries/to-copy/server/default/conf/props jboss-as-binaries/to-copy/se!
rver/default/conf/xmdesc jboss-as-binaries/to-copy/server/default/depl
oy jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/META-INF jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/classes jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/classes/org/jboss/invocation jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/classes/org/jboss/invocation/http jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/classes/org/jboss/invocation/http/servlet jboss-as-binaries/to-copy/server!
/default/deploy/jboss-aop.deployer jboss-as-binaries/to-copy/server/default/deploy/jboss-aop.deployer/META-INF jboss-as-binaries/to-copy/server/default/deploy/jboss-bean.deployer jboss-as-binaries/to-copy/server/default/deploy/jboss-bean.deployer/META-INF jboss-as-binaries/to-copy/server/default/deploy/jboss-hibernate.deployer jboss-as-binaries/to-copy/server/default/deploy/jboss-hibernate.deployer/META-INF jboss-as-binaries/to-copy/server/default/deploy/jboss-ws4ee.sar jboss-as-binaries/to-copy/server/default/deploy/jboss-ws4ee.sar/META-INF jboss-as-binaries/to-copy/server/default/deploy/jbossweb-tomcat55.sar jboss-as-binaries/to-copy/server/default/deploy/jbossweb-tomcat55.sar/META-INF jboss-as-binaries/to-copy/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war jboss-as-binaries/to-copy/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/WEB-INF jboss-as-binaries/to-copy/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/manager jboss-as-binaries/to-copy/server/defau!
lt/deploy/jbossweb-tomcat55.sar/conf jboss-as-binaries/to-copy/server/
default/deploy/jbossweb-tomcat55.sar/jsf-libs jboss-as-binaries/to-copy/server/default/deploy/jms jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/META-INF jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/META-INF jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq jb!
oss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il/http jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il/http/servlet jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/META-INF jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx jboss-as-binaries/to-copy/server/default/deploy/j!
mx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor jboss-as-binaries
/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor/control jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor/html jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor/model jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/cluster jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/images jboss-as-binaries/to-copy/server/default/deploy/management jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/META-INF jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/META-INF jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF jboss-as-binaries/to-copy/serv!
er/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/tlds jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/css jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/images jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/img jboss-as-binaries/to-copy/server/default/lib jboss-as-binaries/to-copy/server/minimal jboss-as-binaries/to-copy/server/minimal/conf jboss-as-binaries/to-copy/server/minimal/lib jspwiki jspwiki/src/pl/net/mamut/jspwiki jspwiki/src/webdocs jspwiki/tests jspwiki/tests/stress jspwiki/tld jspwiki-new jspwiki-new/etc jspwiki-new/etc/classes/pl/net/mamut/jspwiki jspwiki-new/src/com/ecyrd/jspwiki jspwiki-new/src/com/ecyrd/jspwiki/tags jspwiki-new/src/pl/net/mamut/jspwiki mysql-connector portal-binaries portal-binaries/to-!
copy portal-binaries/to-copy/jboss-portal.sar portal-binaries/to-copy/
jboss-portal.sar/META-INF portal-binaries/to-copy/jboss-portal.sar/conf portal-binaries/to-copy/jboss-portal.sar/conf/cache portal-binaries/to-copy/jboss-portal.sar/conf/hibernate portal-binaries/to-copy/jboss-portal.sar/conf/theme portal-binaries/to-copy/jboss-portal.sar/lib portal-binaries/to-copy/jboss-portal.sar/org portal-binaries/to-copy/jboss-portal.sar/org/jboss portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal/core portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal/core/impl portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal/core/impl/preferences portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal/core/impl/role portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal/core/impl/user portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/default-content portal-b!
inaries/to-copy/jboss-portal.sar/portal-cms.sar/default-content/files portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/default-content/files/default portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/default-content/files/default/images portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/default-content/files/default/support portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/default-content/files/errorpages portal-binaries/to-copy/jboss-portal.sar/portal-cms.war portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/WEB-INF portal-binaries/to-copy/jboss-portal.sar/portal-core.war portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp portal-binaries/to-copy/jboss-portal.sar/!
portal-core.war/WEB-INF/jsp/admin portal-binaries/to-copy/jboss-portal
.sar/portal-core.war/WEB-INF/jsp/cms portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/default portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/default/errorpages portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/default/support portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/permission portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/test portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/admin portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/catalog portal-binaries/to-copy/jboss-p!
ortal.sar/portal-core.war/images/cms portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advhr portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advhr/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advhr/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advimage portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advimage/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advlink porta!
l-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/t
iny_mce/plugins/advlink/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/emotions portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/emotions/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/emotions/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/flash portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/flash/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/flash/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/iespell portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/iespell/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/iespell/langs portal-binaries/to-copy/jboss-po!
rtal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/insertdatetime portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/insertdatetime/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/insertdatetime/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/preview portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/preview/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/preview/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/zoom portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/zoom/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/a!
dvanced portal-binaries/to-copy/jboss-portal.sar/portal-core.war/image
s/cms/admin/tiny_mce/themes/advanced/docs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/ca_fr portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/ca_fr/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/cz portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/cz/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/de portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/de/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/es portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/es/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/!
images/cms/admin/tiny_mce/themes/advanced/docs/fi portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/fi/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/hu portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/hu/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/it portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/it/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/nl portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/nl/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/pl portal-binaries/to-copy/jboss-portal.sar/portal-core.w!
ar/images/cms/admin/tiny_mce/themes/advanced/docs/pl/images portal-bin
aries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/se portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/se/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/uk portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/uk/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/ca_fr portal-binaries/to-copy/jboss-portal!
.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/ca_fr/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/cz portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/cz/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/de portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/de/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/es portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/es/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/hu portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/hu/images portal-binaries/to-copy/jboss-po!
rtal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs
/it portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/it/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/pl portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/pl/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/se portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/se/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/uk portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/uk/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/simple portal-binari!
es/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/simple/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/permission portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/role portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/user portal-binaries/to-copy/jboss-portal.sar/portal-core.war/login portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/css portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portal_utils portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portal_utils/btn_portlet_left portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portal_utils/btn_portlet_middle portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portlet_black_bottom portal-binaries/to-copy/jboss-portal.s!
ar/portal-core.war/nodesk/images/portlet_black_middle portal-binaries/
to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portlet_black_top portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portlet_left_middle portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portlet_left_top portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portlet_middle_bottom portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portlet_middle_top portal-binaries/to-copy/jboss-portal.sar/portal-server.war portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF portal-binaries/to-copy-head portal-binaries/to-copy-head/docs portal-binaries/to-copy-head/docs/licenses portal-binaries/to-copy-head/docs/referenceGuide portal-binaries/to-copy-head/docs/referenceGuide/html portal-binaries/to-copy-head/docs/referenceGuide/html/css portal-binaries/to-copy-head/docs/referenceGuide/html/images portal-binaries/to-copy-head/doc!
s/referenceGuide/html_single portal-binaries/to-copy-head/docs/referenceGuide/html_single/css portal-binaries/to-copy-head/docs/referenceGuide/html_single/images portal-binaries/to-copy-head/docs/referenceGuide/pdf portal-binaries/to-copy-head/docs/userGuide portal-binaries/to-copy-head/docs/userGuide/html portal-binaries/to-copy-head/docs/userGuide/html/css portal-binaries/to-copy-head/docs/userGuide/html/images portal-binaries/to-copy-head/docs/userGuide/html/images/admincms portal-binaries/to-copy-head/docs/userGuide/html/images/forums portal-binaries/to-copy-head/docs/userGuide/html/images/permissions portal-binaries/to-copy-head/docs/userGuide/html/images/role portal-binaries/to-copy-head/docs/userGuide/html/images/setup portal-binaries/to-copy-head/docs/userGuide/html_single portal-binaries/to-copy-head/docs/userGuide/html_single/css portal-binaries/to-copy-head/docs/userGuide/html_single/images portal-binaries/to-copy-head/docs/userGuide/html_single/images/admincms p!
ortal-binaries/to-copy-head/docs/userGuide/html_single/images/forums p
ortal-binaries/to-copy-head/docs/userGuide/html_single/images/permissions portal-binaries/to-copy-head/docs/userGuide/html_single/images/role portal-binaries/to-copy-head/docs/userGuide/html_single/images/setup portal-binaries/to-copy-head/docs/userGuide/pdf portal-binaries/to-copy-head/setup portal-default portal-default/src/web/WEB-INF portal-default/to-copy/jboss-portal.sar/portal-core.war/WEB-INF portal-federation portal-federation/src/web/WEB-INF portal-federation/src/web/WEB-INF/tld
Reply-to: jbo...@li...
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <E1E...@co...>
Date: Fri, 26 Aug 2005 23:09:53 -0400
Author: dam...@jb...
Date: 2005-08-26 22:56:45 -0400 (Fri, 26 Aug 2005)
New Revision: 990
Added:
prod/forge/portal-extensions/binaries/maven-repo-addons/jboss/jars/jboss-aop.jar
prod/forge/portal-extensions/binaries/maven-repo-addons/jboss/jars/jboss-ejb3.jar
prod/forge/portal-extensions/binaries/maven-repo-addons/jboss/jars/jboss-ejb3x.jar
prod/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-cli.jar
prod/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-javahl.jar
prod/forge/portal-extensions/federation-register/maven.xml
prod/forge/portal-extensions/forge-ads/maven.xml
prod/forge/portal-extensions/forge-blog/maven.xml
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeProperties.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/SearchTools.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/BlogNodeWatcher.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/BlogUpdaterNodeWatcher.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/ContentManager.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/FileBasedContentManager.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DomToXmlTransformer.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsNodeWatcher.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/service/
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/service/ForgeManagement.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/service/NodeWatcher.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/service/ResourceWatcher.java
prod/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java
prod/forge/portal-extensions/forge-contributor/maven.xml
prod/forge/portal-extensions/forge-contributor/src/etc/
prod/forge/portal-extensions/forge-contributor/src/etc/Messages.properties
prod/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConAccessBean.java
prod/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java
prod/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDescriptor.java
prod/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java
prod/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java
prod/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
prod/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java
prod/forge/portal-extensions/forge-contributor/src/web/WEB-INF/faces-config.xml
prod/forge/portal-extensions/forge-ear/
prod/forge/portal-extensions/forge-ear/src/
prod/forge/portal-extensions/forge-ear/src/META-INF/
prod/forge/portal-extensions/forge-ear/src/META-INF/application.xml
prod/forge/portal-extensions/forge-file-access/maven.xml
prod/forge/portal-extensions/forge-file-access/src/etc/
prod/forge/portal-extensions/forge-file-access/src/etc/mime-types.txt
prod/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/
prod/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld
prod/forge/portal-extensions/forge-forums/
prod/forge/portal-extensions/forge-forums/maven.xml
prod/forge/portal-extensions/forge-forums/project.xml
prod/forge/portal-extensions/forge-forums/to-copy/
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/MANIFEST.MF
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/application.xml
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/jboss-app.xml
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums-lib.jar
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/MANIFEST.MF
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/jboss-service.xml
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/hibernate.cfg.xml
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/setup.txt
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/
prod/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums...
[truncated message content] |
|
From: <jbo...@li...> - 2005-08-27 02:07:21
|
Author: dam...@jb... Date: 2005-08-26 22:07:17 -0400 (Fri, 26 Aug 2005) New Revision: 989 Added: trunk/jira-extensions/ Removed: trunk/forge/jira-extensions/ Log: Moving jira-extensions out of forge to lock it down. Copied: trunk/jira-extensions (from rev 988, trunk/forge/jira-extensions) |
|
From: <jbo...@li...> - 2005-08-27 01:50:55
|
Author: dam...@jb... Date: 2005-08-26 21:50:49 -0400 (Fri, 26 Aug 2005) New Revision: 988 Modified: qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java qa/forge/portal-extensions/forge-portal-attr/maven.xml qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java Log: MERGED: -r 984:987 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. Modified: qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java =================================================================== --- qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java 2005-08-27 01:50:49 UTC (rev 988) @@ -91,7 +91,8 @@ SVNRevision.HEAD, SVNRevision.HEAD, true); } } catch (SVNException e) { - try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); } + e.printStackTrace(); + try { cleanup(); } catch (SVNException e1) { } } } @@ -108,7 +109,7 @@ ourClientManager.getCommitClient().doCommit(files, false, "Forge service commit.", true, true); } catch (SVNException e) { - try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); } + try { cleanup(); } catch (SVNException e1) { } e.printStackTrace(); throw new IOException(e.getMessage()); @@ -154,7 +155,8 @@ try { ourClientManager.getWCClient().doAdd(file, true, false, false, false); } catch (SVNException e) { - try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); } + e.printStackTrace(); + try { cleanup(); } catch (SVNException e1) { } throw new IOException("SVN error while adding the new file"); } } Modified: qa/forge/portal-extensions/forge-portal-attr/maven.xml =================================================================== --- qa/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-27 01:50:49 UTC (rev 988) @@ -15,7 +15,7 @@ </goal> <goal name="deploy"> - <ant:copy todir="${local.deploy.dir}"> + <ant:copy todir="${local.deploy.dir}" overwrite="true"> <ant:fileset dir="to-copy" /> </ant:copy> <ant:copy Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-27 01:50:49 UTC (rev 988) @@ -300,8 +300,8 @@ } public WikiType getWikiType(String wikiTypeName) { - System.out - .println("[WIKITYPE REQUEST]: " + wikiTypes.get(wikiTypeName)); + //System.out + // .println("[WIKITYPE REQUEST]: " + wikiTypes.get(wikiTypeName)); return wikiTypes.get(wikiTypeName); } @@ -340,7 +340,7 @@ } public Set<String> findPages(String searchQuery) { - System.out.println("Starting search: " + searchQuery); + //System.out.println("Starting search: " + searchQuery); WikiSearch wikiSearch = new WikiSearch(searchQuery); Set<String> resPages = new TreeSet<String>(); @@ -356,7 +356,7 @@ } } - System.out.println("Search completed"); + //System.out.println("Search completed"); return resPages; } Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-27 01:50:49 UTC (rev 988) @@ -304,7 +304,7 @@ if (rReq.getParameter("type") != null) { type = rReq.getParameter("type"); - System.out.println("Getting type: " + type); + //System.out.println("Getting type: " + type); } wikiContext = new WikiContext(rReq.getUser(), wikiEngine Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-27 01:50:49 UTC (rev 988) @@ -88,7 +88,7 @@ // execute the plugins for (int i = 0; i < plugins.size(); i++) { - System.out.println("Executing plugin: "+plugins.get(i).getName()); + //System.out.println("Executing plugin: "+plugins.get(i).getName()); newPage = (plugins.get(i)).process(newPage, wikiSession); } Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-27 01:50:49 UTC (rev 988) @@ -98,7 +98,7 @@ // Parse URI to get filename and page name String[] tokens = requestURI.split("[/]"); - System.out.println("length " + tokens.length); + //System.out.println("length " + tokens.length); if (tokens.length == 3) { String hostURL = ((request.isSecure()) ? "https" : "http") + "://"+request.getServerName()+((request.getServerPort() == 80) ? "" : ":"+ request.getServerPort()); @@ -110,8 +110,8 @@ String fileName = tokens[tokens.length - 1]; String pageName = tokens[tokens.length - 2]; - System.out.println("[WikiFileAccess]Getting file: " + fileName - + " of page: " + pageName); + //System.out.println("[WikiFileAccess]Getting file: " + fileName + // + " of page: " + pageName); Properties props = new Properties(); Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-27 01:50:49 UTC (rev 988) @@ -41,7 +41,7 @@ pattern = "<a href=\""+(((String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+\">"; - System.out.println(pattern); + //System.out.println(pattern); WikiPage newPage = null; |
|
From: <jbo...@li...> - 2005-08-26 22:19:53
|
Author: adamw
Date: 2005-08-26 18:19:47 -0400 (Fri, 26 Aug 2005)
New Revision: 987
Modified:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java
trunk/forge/portal-extensions/forge-portal-attr/maven.xml
Log:
Svn showing erros & attributes filter - build fix
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java 2005-08-26 22:08:50 UTC (rev 986)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java 2005-08-26 22:19:47 UTC (rev 987)
@@ -91,7 +91,8 @@
SVNRevision.HEAD, SVNRevision.HEAD, true);
}
} catch (SVNException e) {
- try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); }
+ e.printStackTrace();
+ try { cleanup(); } catch (SVNException e1) { }
}
}
@@ -108,7 +109,7 @@
ourClientManager.getCommitClient().doCommit(files, false,
"Forge service commit.", true, true);
} catch (SVNException e) {
- try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); }
+ try { cleanup(); } catch (SVNException e1) { }
e.printStackTrace();
throw new IOException(e.getMessage());
@@ -154,7 +155,8 @@
try {
ourClientManager.getWCClient().doAdd(file, true, false, false, false);
} catch (SVNException e) {
- try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); }
+ e.printStackTrace();
+ try { cleanup(); } catch (SVNException e1) { }
throw new IOException("SVN error while adding the new file");
}
}
Modified: trunk/forge/portal-extensions/forge-portal-attr/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-26 22:08:50 UTC (rev 986)
+++ trunk/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-26 22:19:47 UTC (rev 987)
@@ -15,7 +15,7 @@
</goal>
<goal name="deploy">
- <ant:copy todir="${local.deploy.dir}">
+ <ant:copy todir="${local.deploy.dir}" overwrite="true">
<ant:fileset dir="to-copy" />
</ant:copy>
<ant:copy
|
|
From: <jbo...@li...> - 2005-08-26 22:08:55
|
Author: szimano
Date: 2005-08-26 18:08:50 -0400 (Fri, 26 Aug 2005)
New Revision: 986
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/WikiPortlet.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/fileaccess/WikiFileAccessFilter.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java
Log:
removed garbage from log
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-26 20:45:58 UTC (rev 985)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-26 22:08:50 UTC (rev 986)
@@ -300,8 +300,8 @@
}
public WikiType getWikiType(String wikiTypeName) {
- System.out
- .println("[WIKITYPE REQUEST]: " + wikiTypes.get(wikiTypeName));
+ //System.out
+ // .println("[WIKITYPE REQUEST]: " + wikiTypes.get(wikiTypeName));
return wikiTypes.get(wikiTypeName);
}
@@ -340,7 +340,7 @@
}
public Set<String> findPages(String searchQuery) {
- System.out.println("Starting search: " + searchQuery);
+ //System.out.println("Starting search: " + searchQuery);
WikiSearch wikiSearch = new WikiSearch(searchQuery);
Set<String> resPages = new TreeSet<String>();
@@ -356,7 +356,7 @@
}
}
- System.out.println("Search completed");
+ //System.out.println("Search completed");
return resPages;
}
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-26 20:45:58 UTC (rev 985)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-26 22:08:50 UTC (rev 986)
@@ -304,7 +304,7 @@
if (rReq.getParameter("type") != null) {
type = rReq.getParameter("type");
- System.out.println("Getting type: " + type);
+ //System.out.println("Getting type: " + type);
}
wikiContext = new WikiContext(rReq.getUser(), wikiEngine
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-26 20:45:58 UTC (rev 985)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-26 22:08:50 UTC (rev 986)
@@ -88,7 +88,7 @@
// execute the plugins
for (int i = 0; i < plugins.size(); i++) {
- System.out.println("Executing plugin: "+plugins.get(i).getName());
+ //System.out.println("Executing plugin: "+plugins.get(i).getName());
newPage = (plugins.get(i)).process(newPage, wikiSession);
}
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-26 20:45:58 UTC (rev 985)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-26 22:08:50 UTC (rev 986)
@@ -98,7 +98,7 @@
// Parse URI to get filename and page name
String[] tokens = requestURI.split("[/]");
- System.out.println("length " + tokens.length);
+ //System.out.println("length " + tokens.length);
if (tokens.length == 3) {
String hostURL = ((request.isSecure()) ? "https" : "http") + "://"+request.getServerName()+((request.getServerPort() == 80) ? "" : ":"+ request.getServerPort());
@@ -110,8 +110,8 @@
String fileName = tokens[tokens.length - 1];
String pageName = tokens[tokens.length - 2];
- System.out.println("[WikiFileAccess]Getting file: " + fileName
- + " of page: " + pageName);
+ //System.out.println("[WikiFileAccess]Getting file: " + fileName
+ // + " of page: " + pageName);
Properties props = new Properties();
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-26 20:45:58 UTC (rev 985)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-26 22:08:50 UTC (rev 986)
@@ -41,7 +41,7 @@
pattern = "<a href=\""+(((String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+\">";
- System.out.println(pattern);
+ //System.out.println(pattern);
WikiPage newPage = null;
|
|
From: <jbo...@li...> - 2005-08-26 20:46:02
|
Author: dam...@jb... Date: 2005-08-26 16:45:58 -0400 (Fri, 26 Aug 2005) New Revision: 985 Modified: qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java Log: MERGED: -r 982:984 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. Modified: qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java =================================================================== --- qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 20:38:24 UTC (rev 984) +++ qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 20:45:58 UTC (rev 985) @@ -129,6 +129,8 @@ else { start = element.lastIndexOf("../");//go one level up end = mainPath.lastIndexOf("/");//find last level + if(end == -1) + {end = 0;} //we have reached last level element = element.substring(0, start) + element .substring(start + 3, element.length()); @@ -237,6 +239,7 @@ response.getWriter().write(pageContent); } catch (Exception e) { + e.printStackTrace(); response.getWriter().write( "The page you requested cannot be accessed due to " + e.toString()); |
Author: dam...@jb... Date: 2005-08-26 16:38:24 -0400 (Fri, 26 Aug 2005) New Revision: 984 Modified: qa/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java qa/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml Log: MERGED: -r 976:982 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. Modified: qa/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java =================================================================== --- qa/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java 2005-08-26 20:36:38 UTC (rev 983) +++ qa/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java 2005-08-26 20:38:24 UTC (rev 984) @@ -51,6 +51,11 @@ */ private final static String DOCS_ACCESS = "/docs/"; /** + * <code>FREEZONE_ACCESS</code> - another directory from which files are + * enabled to download. + */ + private final static String FREEZONE_ACCESS = "/freezone/"; + /** * <code>BUF_SIZE</code> - size of a buffer, which is used while reading a * file and sending it to the client. */ @@ -82,7 +87,8 @@ if ((toCheck.indexOf(IMAGES_ACCESS) != -1) || (toCheck.indexOf(DOWNLOADS_ACCESS) != -1) - || (toCheck.indexOf(DOCS_ACCESS) != -1)) { + || (toCheck.indexOf(DOCS_ACCESS) != -1) + || (toCheck.indexOf(FREEZONE_ACCESS) != -1)) { // Allowing access to images, downloads and docs } else // Not images, nor downloads - wrong request. Modified: qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java =================================================================== --- qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 20:36:38 UTC (rev 983) +++ qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 20:38:24 UTC (rev 984) @@ -94,10 +94,15 @@ // modifies path to page/resource so folder structure can be supported private String modifyPath(String path, String element) { - System.out.println("element is: "+ element); - System.out.println("path is: "+ path); + // System.out.println("element is: "+ element); + // System.out.println("path is: "+ path); int start, end; String mainPath = ""; + if (element.startsWith("#")) + { + return path+element; + + } int pre = path.lastIndexOf('/'); if(pre== -1)//we are in root dir @@ -106,10 +111,9 @@ } else { mainPath = path.substring(0, pre); - System.out.println("main path is: " + mainPath); - }//main path to page + }//main path to page - + if (element.startsWith("/")) return element.substring(1); //base path, start with WEB-root @@ -126,13 +130,10 @@ start = element.lastIndexOf("../");//go one level up end = mainPath.lastIndexOf("/");//find last level element = element.substring(0, start) - //+ mainPath - // .substring(end, mainPath.length()) - + element - .substring(start + 3, element.length()); - // System.out.println("element is: " + element); + + element + .substring(start + 3, element.length()); mainPath = mainPath.substring(0, end); - // System.out.println("mainPath is: " + mainPath); + }//else }//while @@ -181,6 +182,11 @@ { pageContent = forgeHelper.replace(pageContent,"HREF=", "href="); } + + while(pageContent.indexOf("<IMG SRC=")!= -1) + { + pageContent = forgeHelper.replace(pageContent,"<IMG SRC=", "<img src="); + } // Replacing links while ((nextRef = findNextReference(pageContent, "link")) != null) { @@ -203,8 +209,10 @@ String imagePrepend = "/file-access/" + portalName + "/" + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"+ProjectsHelper.FREEZONE_DIR+"/"; while ((nextRef = findNextReference(pageContent, "image")) != null) + { + nextRef2 = modifyPath(pagePath, nextRef); pageContent = forgeHelper.replace(pageContent, "<img src="+'"' - + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef+'"'); + + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef2+'"');} //fix back internal links while (pageContent.indexOf(" /portal/index.html?ctrl:id") != -1) Modified: qa/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml =================================================================== --- qa/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml 2005-08-26 20:36:38 UTC (rev 983) +++ qa/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml 2005-08-26 20:38:24 UTC (rev 984) @@ -19,8 +19,8 @@ being broken with multicast (even after disabling media sense) set the loopback attribute to true --> <UDP - mcast_addr="228.1.2.3" mcast_port="48866" - ip_ttl="64" ip_mcast="true" + mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" mcast_port="48866" + ip_ttl="64" ip_mcast="true"bind_addr="${jboss.bind.address}" mcast_send_buf_size="150000" mcast_recv_buf_size="80000" ucast_send_buf_size="150000" ucast_recv_buf_size="80000" loopback="false"/> |
|
From: <jbo...@li...> - 2005-08-26 20:36:42
|
Author: ral...@jb...
Date: 2005-08-26 16:36:38 -0400 (Fri, 26 Aug 2005)
New Revision: 983
Modified:
trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
Log:
bugfix
Modified: trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 19:35:41 UTC (rev 982)
+++ trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 20:36:38 UTC (rev 983)
@@ -129,6 +129,8 @@
else {
start = element.lastIndexOf("../");//go one level up
end = mainPath.lastIndexOf("/");//find last level
+ if(end == -1)
+ {end = 0;} //we have reached last level
element = element.substring(0, start)
+ element
.substring(start + 3, element.length());
@@ -237,6 +239,7 @@
response.getWriter().write(pageContent);
} catch (Exception e) {
+ e.printStackTrace();
response.getWriter().write(
"The page you requested cannot be accessed due to "
+ e.toString());
|
|
From: <jbo...@li...> - 2005-08-26 19:35:44
|
Author: ral...@jb...
Date: 2005-08-26 15:35:41 -0400 (Fri, 26 Aug 2005)
New Revision: 982
Modified:
trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
Log:
Modified: trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 18:57:13 UTC (rev 981)
+++ trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 19:35:41 UTC (rev 982)
@@ -98,6 +98,11 @@
// System.out.println("path is: "+ path);
int start, end;
String mainPath = "";
+ if (element.startsWith("#"))
+ {
+ return path+element;
+
+ }
int pre = path.lastIndexOf('/');
if(pre== -1)//we are in root dir
@@ -106,10 +111,9 @@
}
else {
mainPath = path.substring(0, pre);
- // System.out.println("main path is: " + mainPath);
- }//main path to page
+ }//main path to page
-
+
if (element.startsWith("/"))
return element.substring(1); //base path, start with WEB-root
@@ -126,13 +130,10 @@
start = element.lastIndexOf("../");//go one level up
end = mainPath.lastIndexOf("/");//find last level
element = element.substring(0, start)
- //+ mainPath
- // .substring(end, mainPath.length())
- + element
- .substring(start + 3, element.length());
- // System.out.println("element is: " + element);
+ + element
+ .substring(start + 3, element.length());
mainPath = mainPath.substring(0, end);
- // System.out.println("mainPath is: " + mainPath);
+
}//else
}//while
|
|
From: <jbo...@li...> - 2005-08-26 18:32:10
|
Author: dam...@jb...
Date: 2005-08-26 14:32:07 -0400 (Fri, 26 Aug 2005)
New Revision: 980
Modified:
trunk/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml
Log:
Added the bind address and the udp port bind option to the replicated.xml file so we can run more than one version of as in our qa environ.
Modified: trunk/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml
===================================================================
--- trunk/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml 2005-08-26 17:44:37 UTC (rev 979)
+++ trunk/forge/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/cache/replicated.xml 2005-08-26 18:32:07 UTC (rev 980)
@@ -19,8 +19,8 @@
being broken with multicast (even after disabling media sense)
set the loopback attribute to true -->
<UDP
- mcast_addr="228.1.2.3" mcast_port="48866"
- ip_ttl="64" ip_mcast="true"
+ mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" mcast_port="48866"
+ ip_ttl="64" ip_mcast="true"bind_addr="${jboss.bind.address}"
mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
loopback="false"/>
|
Author: adamw
Date: 2005-08-26 13:44:37 -0400 (Fri, 26 Aug 2005)
New Revision: 979
Added:
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/actions.xml
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/entitydefs/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/entitydefs/entitygroup.xml
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/entitydefs/entitymodel.xml
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/votes-assigment-types.xml
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/decorators/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/decorators/admin.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/decorators/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/decorators/bodytop.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/table/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/navigator/table/header.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/panels/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/panels/project/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/includes/panels/project/schemes.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/addscheme.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/addvotesassigment.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/deletescheme.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/deletevotesassigment.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/editscheme.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/editvotesassigments.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/admin/views/voting/viewschemes.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/views/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/views/voting/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/project/views/voting/selectprojectscheme.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/globalreports/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/globalreports/globalreports.jsp
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/
trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp
trunk/forge/jira-extensions/multiselect/jira-3.3/
trunk/forge/jira-extensions/multiselect/jira-3.3/edit-webapp/
trunk/forge/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/
trunk/forge/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/
trunk/forge/jira-extensions/multiselect/jira-3.3/edit-webapp/WEB-INF/lib/atlassian-configurableobjects-0.4.11.jar
Removed:
trunk/forge/jira-extensions/voting/src/jsp/
Modified:
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/src/etc/pl/net/mamut/jira/developersinvolvement/developersinvolvement_report.properties
trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/navigator/rnotes.jsp
trunk/forge/jira-extensions/project.xml
trunk/forge/jira-extensions/releasenotes-affect-report/.classpath
trunk/forge/jira-extensions/releasenotes-affect-report/.project
trunk/forge/jira-extensions/releasenotes-affect-report/src/etc/atlassian-plugin.xml
trunk/forge/jira-extensions/releasenotes-affect-report/src/etc/templates/releasenotes-affectreport/releasenotes-affect-html.vm
trunk/forge/jira-extensions/releasenotes-affect-report/src/etc/templates/releasenotes-affectreport/releasenotes-affect-report.vm
trunk/forge/jira-extensions/releasenotes-affect-report/src/etc/templates/releasenotes-affectreport/releasenotes-affect-text.vm
trunk/forge/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java
trunk/forge/jira-extensions/releasenotes-report/src/etc/atlassian-plugin.xml
trunk/forge/jira-extensions/releasenotes-report/src/etc/pl/net/mamut/releasenotes_report.properties
trunk/forge/jira-extensions/releasenotes-report/src/etc/templates/releasenotesreport/releasenotes-html.vm
trunk/forge/jira-extensions/releasenotes-report/src/etc/templates/releasenotesreport/releasenotes-report.vm
trunk/forge/jira-extensions/releasenotes-report/src/etc/templates/releasenotesreport/releasenotes-text.vm
trunk/forge/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java
trunk/forge/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml
trunk/forge/jira-extensions/roadmap-report/src/etc/pl/net/mamut/jira/roadmap_report.properties
trunk/forge/jira-extensions/voting/.classpath
trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/voting/DefaultVotingSchemeManager.java
trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/voting/VotingManagerFactory.java
trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddScheme.java
trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddVotesAssigment.java
trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/CopyScheme.java
trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/DeleteScheme.java
trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/DeleteVotesAssigment.java
trunk/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/EditVotesAssigments.java
Log:
Compatibility with JIRA 3.3
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-26 17:14:14 UTC (rev 978)
+++ trunk/forge/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-26 17:44:37 UTC (rev 979)
@@ -6,7 +6,6 @@
import com.atlassian.jira.config.ConstantsManager;
import com.atlassian.jira.config.properties.ApplicationProperties;
-import com.atlassian.jira.issue.IssueManager;
import com.atlassian.jira.issue.search.SearchException;
import com.atlassian.jira.issue.search.SearchProvider;
import com.atlassian.jira.issue.search.SearchRequest;
@@ -32,7 +31,6 @@
import java.util.*;
import org.ofbiz.core.entity.GenericValue;
-
/**
*
* @author adamw
@@ -40,7 +38,6 @@
public class ChangelogGlobalReport extends AbstractGlobalReport
{
private final SearchProvider searchProvider;
- private final IssueManager issueManager;
private final ConstantsManager constantsManager;
private final ApplicationProperties appProps;
private final OutlookDateManager outlookDateManager;
@@ -48,12 +45,11 @@
private final VersionManager versionManager;
public ChangelogGlobalReport(OutlookDateManager outlookDateManager, ApplicationProperties appProps,
- ConstantsManager constantsManager, SearchProvider searchProvider, IssueManager issueManager,
+ ConstantsManager constantsManager, SearchProvider searchProvider,
ProjectManager projectManager, VersionManager versionManager)
{
this.outlookDateManager = outlookDateManager;
this.searchProvider = searchProvider;
- this.issueManager = issueManager;
this.constantsManager = constantsManager;
this.appProps = appProps;
this.projectManager = projectManager;
Modified: trunk/forge/jira-extensions/common.xml
===================================================================
--- trunk/forge/jira-extensions/common.xml 2005-08-26 17:14:14 UTC (rev 978)
+++ trunk/forge/jira-extensions/common.xml 2005-08-26 17:44:37 UTC (rev 979)
@@ -6,7 +6,7 @@
<dependencies>
<dependency>
<id>atlassian-jira</id>
- <version>3.2</version>
+ <version>3.3</version>
</dependency>
<dependency>
@@ -21,7 +21,7 @@
<dependency>
<id>atlassian-ofbiz</id>
- <version>0.2</version>
+ <version>0.2.6</version>
</dependency>
<dependency>
@@ -41,7 +41,7 @@
<dependency>
<id>atlassian-scheduler</id>
- <version>0.6.6</version>
+ <version>0.7.9</version>
</dependency>
<dependency>
@@ -51,7 +51,7 @@
<dependency>
<id>atlassian-johnson</id>
- <version>0.5</version>
+ <version>0.5.7</version>
</dependency>
<dependency>
Modified: trunk/forge/jira-extensions/developersinvolvement-report/src/etc/pl/net/mamut/jira/developersinvolvement/developersinvolvement_report.properties
===================================================================
--- trunk/forge/jira-extensions/developersinvolvement-report/src/etc/pl/net/mamut/jira/developersinvolvement/developersinvolvement_report.properties 2005-08-26 17:14:14 UTC (rev 978)
+++ trunk/forge/jira-extensions/developersinvolvement-report/src/etc/pl/net/mamut/jira/developersinvolvement/developersinvolvement_report.properties 2005-08-26 17:44:37 UTC (rev 979)
@@ -6,9 +6,9 @@
report.developersinvolvement.enddate = End Date
report.developersinvolvement.enddate.description = The end of the period.
report.developersinvolvement.showusers = Show Users
-report.developersinvolvement.showusers.description = Select weather to show all users or only active
+report.developersinvolvement.showusers.description = Select whether to show all users or only active
report.developersinvolvement.showproj = Show Projects
-report.developersinvolvement.showproj.description = Select weather to show all projects or only active
+report.developersinvolvement.showproj.description = Select whether to show all projects or only active
report.developersinvolvement.enddate.required = A valid "End Date" is required to generate this report.
report.developersinvolvement.error = Error occurred generating Issue Creation Report.
Modified: trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/navigator/rnotes.jsp
===================================================================
--- trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-26 17:14:14 UTC (rev 978)
+++ trunk/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-26 17:44:37 UTC (rev 979)
@@ -8,7 +8,8 @@
com.atlassian.jira.web.component.IssueTableWebComponent,
com.atlassian.jira.issue.search.SearchResults,
com.atlassian.jira.config.ConstantsManager,
- com.atlassian.jira.web.bean.PagerFilter"%>
+ com.atlassian.jira.web.bean.PagerFilter,
+ com.opensymphony.util.TextUtils"%>
<%@ taglib uri="webwork" prefix="webwork" %>
<%@ taglib uri="sitemesh-page" prefix="page" %>
@@ -70,7 +71,8 @@
IssueNavigator issueNavigator = (IssueNavigator) request.getAttribute("issueNavigator");
SearchResults searchResults = issueNavigator.getSearchResults();
List issues = searchResults.getIssues();
-
+ TextUtils textUtils = new TextUtils();
+
Iterator iter;
/* Map: issue type id -> (Set of issue) */
Map issuesMap = new TreeMap();
@@ -109,7 +111,7 @@
[ <a href="<%= request.getContextPath() %>/browse/<%= issue.getString("key") %>">
<%= issue.getString("key") %>
</a> ]
- <%= issue.getString("summary") %>
+ <%= textUtils.htmlEncode(issue.getString("summary")) %>
</li>
<%
}
@@ -138,7 +140,7 @@
%>
*
[ <%= issue.getString("key") %> ]
- <%= issue.getString("summary") %>
+ <%= textUtils.htmlEncode(issue.getString("summary")) %>
<br />
<%
}
Added: trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/actions.xml
===================================================================
--- trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/actions.xml 2005-08-26 17:14:14 UTC (rev 978)
+++ trunk/forge/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/WEB-INF/classes/actions.xml 2005-08-26 17:44:37 UTC (rev 979)
@@ -0,0 +1,2199 @@
+<!-- Actions for the JIRA Web Application -->
+<actions>
+
+ <!-- Entity Administration -->
+ <action name="user.Logout" alias="Logout">
+ <view name="error">/logoutconfirm.jsp</view>
+ <view name="confirm">/logoutconfirm.jsp</view>
+ <view name="logout">/logout.jsp</view>
+ </action>
+
+ <action name="project.AddProject" alias="AddProject" roles-required="admin">
+ <view name="error">/secure/admin/views/addproject.jsp</view>
+ <view name="input">/secure/admin/views/addproject.jsp</view>
+ </action>
+
+ <action name="project.DeleteProject" alias="DeleteProject" roles-required="admin">
+ <view name="success">/secure/admin/default.jsp</view>
+ <view name="error">/secure/admin/views/deleteprojectconfirm.jsp</view>
+ <view name="input">/secure/admin/views/deleteprojectconfirm.jsp</view>
+ </action>
+
+ <action name="admin.notification.SelectProjectScheme" alias="SelectProjectScheme" roles-required="admin">
+ <view name="success">/secure/project/views/notifications/selectprojectscheme.jsp</view>
+ <view name="input">/secure/project/views/notifications/selectprojectscheme.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="admin.workflow.scheme.SelectProjectWorkflowScheme" alias="SelectProjectWorkflowScheme" roles-required="admin">
+ <view name="input">/secure/project/views/workflows/selectprojectscheme.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="admin.workflow.scheme.SelectProjectWorkflowSchemeStep2" alias="SelectProjectWorkflowSchemeStep2" roles-required="admin">
+ <view name="success">/secure/project/views/workflows/selectprojectschemestep2.jsp</view>
+ <view name="error">/secure/project/views/workflows/selectprojectschemestep2.jsp</view>
+ <view name="input">/secure/project/views/workflows/selectprojectschemestep2.jsp</view>
+ <view name="workflowmigrationerror">/secure/views/workflowmigrationerror.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.SelectProjectCategory" alias="SelectProjectCategory" roles-required="admin">
+ <view name="success">/secure/project/views/selectprojectcategory.jsp</view>
+ <view name="input">/secure/project/views/selectprojectcategory.jsp</view>
+ </action>
+
+ <action name="admin.permission.SelectProjectPermissionScheme" alias="SelectProjectPermissionScheme" roles-required="admin">
+ <view name="success">/secure/project/views/permissions/selectprojectpermissionscheme.jsp</view>
+ <view name="input">/secure/project/views/permissions/selectprojectpermissionscheme.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="admin.issuesecurity.SelectProjectIssueSecurityScheme" alias="SelectProjectIssueSecurityScheme" roles-required="admin">
+ <view name="success">/secure/project/views/issuesecurity/selectprojectissuesecurityscheme.jsp</view>
+ <view name="input">/secure/project/views/issuesecurity/selectprojectissuesecurityscheme.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="admin.workflow.ActivateWorkflow" alias="ActivateWorkflow" roles-required="admin">
+ <view name="workflowmigrationerror">/secure/views/workflowmigrationerror.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <!-- User Administration -->
+ <action name="admin.user.GroupBrowser" alias="GroupBrowser" roles-required="admin">
+ <view name="success">/secure/admin/user/views/groupbrowser.jsp</view>
+ </action>
+
+ <action name="admin.user.ViewGroup" alias="ViewGroup" roles-required="admin">
+ <view name="success">/secure/admin/user/views/viewgroup.jsp</view>
+ </action>
+
+ <action name="admin.user.DeleteGroup" alias="DeleteGroup" roles-required="admin">
+ <view name="error">/secure/admin/user/views/deletegroupconfirm.jsp</view>
+ <view name="input">/secure/admin/user/views/deletegroupconfirm.jsp</view>
+ </action>
+
+ <action name="admin.user.UserBrowser" alias="UserBrowser" roles-required="admin">
+ <view name="success">/secure/admin/user/views/userbrowser.jsp</view>
+ </action>
+
+ <action name="admin.user.UserPickerBrowser" alias="UserPickerBrowser" roles-required="pickusers">
+ <view name="success">/secure/popups/userpicker.jsp</view>
+ <view name="input">/secure/popups/userpicker.jsp</view>
+ </action>
+
+ <action name="issue.navigator.DateRangePicker" alias="DateRangePicker">
+ <view name="duedate">/secure/popups/duedatepicker.jsp</view>
+ <view name="generic">/secure/popups/daterangepicker.jsp</view>
+ </action>
+
+ <action name="admin.IconPicker" alias="IconPicker">
+ <view name="error">/secure/popups/iconpicker.jsp</view>
+ <view name="success">/secure/popups/iconpicker.jsp</view>
+ </action>
+
+ <action name="admin.user.AddUser" alias="AddUser" roles-required="admin">
+ <view name="error">/secure/admin/user/views/adduser.jsp</view>
+ <view name="input">/secure/admin/user/views/adduser.jsp</view>
+ </action>
+
+ <action name="admin.user.ViewUser" alias="ViewUser" roles-required="admin">
+ <view name="success">/secure/admin/user/views/viewuser.jsp</view>
+ <view name="error">/secure/admin/user/views/viewuser.jsp</view>
+ </action>
+
+ <action name="admin.user.EditUser" alias="EditUser" roles-required="admin">
+ <view name="error">/secure/admin/user/views/editprofile.jsp</view>
+ <view name="input">/secure/admin/user/views/editprofile.jsp</view>
+ </action>
+
+ <action name="admin.user.EditUserGroups" alias="EditUserGroups" roles-required="admin">
+ <view name="error">/secure/admin/user/views/editusergroups.jsp</view>
+ <view name="success">/secure/admin/user/views/editusergroups.jsp</view>
+ </action>
+
+ <action name="admin.user.DeleteUser" alias="DeleteUser" roles-required="admin">
+ <view name="error">/secure/admin/user/views/deleteuserconfirm.jsp</view>
+ <view name="input">/secure/admin/user/views/deleteuserconfirm.jsp</view>
+ </action>
+
+ <action name="admin.user.SetPassword" alias="SetPassword" roles-required="admin">
+ <view name="error">/secure/admin/user/views/setpassword.jsp</view>
+ <view name="input">/secure/admin/user/views/setpassword.jsp</view>
+ </action>
+
+ <action name="project.EditVersionDetails" alias="EditVersionDetails">
+ <view name="success">/secure/project/views/editversiondetails.jsp</view>
+ <view name="error">/secure/project/views/editversiondetails.jsp</view>
+ <view name="input">/secure/project/views/editversiondetails.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <!-- Project administration -->
+ <action name="project.ViewProjects" alias="ViewProjects">
+ <view name="success">/secure/project/views/viewprojects.jsp</view>
+ </action>
+
+ <action name="project.ViewProject" alias="ViewProject">
+ <view name="input">/secure/project/views/viewprojecterror.jsp</view>
+ <view name="success">/secure/project/views/viewproject.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.EditProject" alias="EditProject">
+ <view name="success">/secure/project/views/editproject.jsp</view>
+ <view name="error">/secure/project/views/editproject.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.AddComponent" alias="AddComponent">
+ <view name="success">/secure/project/views/addcomponent.jsp</view>
+ <view name="error">/secure/project/views/addcomponent.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.DeleteComponent" alias="DeleteComponent">
+ <view name="success">/secure/project/views/deletecomponentconfirm.jsp</view>
+ <view name="error">/secure/project/views/deletecomponentconfirm.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.EditComponent" alias="EditComponent">
+ <view name="success">/secure/project/views/editcomponent.jsp</view>
+ <view name="error">/secure/project/views/editcomponent.jsp</view>
+ <view name="input">/secure/project/views/editcomponent.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.enterprise.SelectComponentAssignees" alias="SelectComponentAssignees">
+ <view name="error">/secure/project/views/select_componentassignees.jsp</view>
+ <view name="input">/secure/project/views/select_componentassignees.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.ManageVersions" alias="ManageVersions">
+ <view name="success">/secure/project/views/manageversions.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ <command name="moveUp" alias="VersionUp">
+ <view name="success">/secure/project/views/manageversions.jsp</view>
+ <view name="error">/secure/project/views/manageversions.jsp</view>
+ </command>
+ <command name="moveDown" alias="VersionDown">
+ <view name="success">/secure/project/views/manageversions.jsp</view>
+ <view name="error">/secure/project/views/manageversions.jsp</view>
+ </command>
+ <command name="moveFirst" alias="VersionFirst">
+ <view name="success">/secure/project/views/manageversions.jsp</view>
+ <view name="error">/secure/project/views/manageversions.jsp</view>
+ </command>
+ <command name="moveLast" alias="VersionLast">
+ <view name="success">/secure/project/views/manageversions.jsp</view>
+ <view name="error">/secure/project/views/manageversions.jsp</view>
+ </command>
+ </action>
+
+ <action name="project.AddVersion" alias="AddVersion">
+ <view name="success">/secure/project/views/manageversions.jsp</view>
+ <view name="error">/secure/project/views/manageversions.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.EditVersionReleaseDate" alias="EditVersionReleaseDate">
+ <view name="success">/secure/project/views/editversionreleasedate.jsp</view>
+ <view name="error">/secure/project/views/editversionreleasedate.jsp</view>
+ <view name="input">/secure/project/views/editversionreleasedate.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.EditVersionReleases" alias="EditVersionReleases">
+ <view name="success">/secure/project/views/manageversions.jsp</view>
+ <view name="input">/secure/project/views/checkversionreleases.jsp</view>
+ <view name="checkrelease">/secure/project/views/checkversionreleases.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.EditVersionArchives" alias="EditVersionArchives">
+ <view name="success">/secure/project/views/manageversions.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.MergeVersions" alias="MergeVersions">
+ <view name="success">/secure/project/views/mergeversionconfirm.jsp</view>
+ <view name="input">/secure/project/views/mergeversionselect.jsp</view>
+ <view name="error">/secure/project/views/mergeversionselect.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ <command name="merge" alias="Merge">
+ <view name="error">/secure/project/views/mergeversionselect.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </command>
+ </action>
+
+ <action name="project.RescheduleVersions" alias="RescheduleVersions">
+ <view name="success">/secure/project/views/rescheduleversions.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <action name="project.DeleteVersion" alias="DeleteVersion">
+ <view name="success">/secure/project/views/deleteversionconfirm.jsp</view>
+ <view name="error">/secure/project/views/deleteversionconfirm.jsp</view>
+ <view name="securitybreach">/secure/views/securitybreach.jsp</view>
+ </action>
+
+ <!--ProjectCategory Actions-->
+ <action name="projectcategory.AddProjectCategory" alias="ViewProjectCategories" roles-required="admin">
+ <view name="success">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view>
+ <view name="input">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view>
+ <view name="error">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view>
+ </action>
+
+ <action name="projectcategory.AddProjectCategory" alias="AddProjectCategory" roles-required="admin">
+ <view name="input">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view>
+ <view name="error">/secure/admin/views/projectcategory/viewprojectcategories.jsp</view>
+ </action>
+
+ <action name="projectcategory.EditProjectCategory" alias="EditProjectCategory" roles-required="admin">
+ <view name="input">/secure/admin/views/projectcategory/editprojectcategory.jsp</view>
+ <view name="error">/secure/admin/views/projectcategory/editprojectcategory.jsp</view>
+ </action>
+
+ <action name="projectcategory.DeleteProjectCategory" alias="DeleteProjectCategory" roles-required="admin">
+ <view name="input">/secure/admin/views/projectcategory/deleteprojectcategoryconfirm.jsp</view>
+ <view name="error">/secure/admin/views/projectcategory/deleteprojectcategoryconfirm.jsp</view>
+ </action>
+
+ <!-- Utility Actions -->
+ <action name="util.ExportAll" alias="XmlBackup" roles-required="admin">
+ <view name="success">/secure/admin/views/exportall_result.jsp</view>
+ <view name="error">/secure/admin/views/exportall_options.jsp</view>
+ <view name="confirm">/secure/admin/views/exportall_confirm.jsp</view>
+ <view name="fixchars">/secure/admin/views/exportall_fixchars.jsp</view>
+ <view name="input">/secure/admin/views/exportall_options.jsp</view>
+ </action>
+
+ <action name="util.ImportAll" alias="XmlRestore" roles-required="admin">
+ <view name="success">/secure/admin/views/importall_result.jsp</view>
+ <view name="error">/secure/admin/views/importall_options.jsp</view>
+ <view name="input">/secure/admin/views/importall_options.jsp</view>
+ </action>
+
+ <!-- The security check is built into this action, as the user is not loged in
+ when it is called. -->
+ <action name="util.CleanData" alias="CleanData">
+ <view name="success">/views/cleandatabase.jsp</view>
+ <view name="error">/views/cleandatabase.jsp</view>
+ </action>
+ <action name="util.LDAPConfigurer" alias="LDAPConfigurer">
+ <view name="success">/views/ldapconfigurer_result.jsp</view>
+ <view name="error">/views/ldapconfigurer.jsp</view>
+ </action>
+
+ <action name="util.BugzillaImport" alias="BugzillaImport" roles-required="admin">
+ <view name="input">/secure/admin/views/bugzillaimport/bugzilla_connect.jsp</view>
+ <view name="success">/secure/admin/views/bugzillaimport/bugzilla_select.jsp</view>
+ <view name="error">/secure/admin/views/bugzillaimport/bugzilla_connect.jsp</view>
+
+ <view name="monitor">/secure/admin/views/bugzillaimport/bugzilla_monitor.jsp?decorator=none</view>
+
+ <command name="setProjectDefaults" alias="BugzillaSetProjectDefaults">
+ <view name="choosemappings">/secure/admin/views/bugzillaimport/bugzilla_choosemappings.jsp</view>
+ </command>
+
+ <command name="run" alias="BugzillaRun">
+ <view name="success">/secure/admin/views/bugzillaimport/bugzilla_run.jsp</view>
+ <view name="input">/secure/admin/views/bugzillaimport/bugzilla_choosemappings.jsp</view>
+ <view name="error">/secure/admin/views/bugzillaimport/bugzilla_select.jsp</view>
+ </command>
+
+ </action>
+ <action name="util.MantisImport" alias="MantisImport" roles-required="admin">
+ <view name="input">/secure/admin/views/mantisimport/mantis_connect.jsp</view>
+ <view name="success">/secure/admin/views/mantisimport/mantis_select.jsp</view>
+ <view name="error">/secure/admin/views/mantisimport/mantis_connect.jsp</view>
+
+ <view name="monitor">/secure/admin/views/mantisimport/mantis_monitor.jsp?decorator=none</view>
+
+ <command name="setProjectDefaults" alias="MantisSetProjectDefaults">
+ <view name="choosemappings">/secure/admin/views/mantisimport/mantis_choosemappings.jsp</view>
+ </command>
+
+ <command name="run" alias="MantisRun">
+ <view name="success">/secure/admin/views/mantisimport/mantis_run.jsp</view>
+ <view name="input">/secure/admin/views/mantisimport/mantis_choosemappings.jsp</view>
+ <view name="error">/secure/admin/views/mantisimport/mantis_select.jsp</view>
+ </command>
+ </action>
+
+ <action name="util.TestTrackProXMLImport" alias="TestTrackProXMLImport" roles-required="admin">
+ <view name="input">/secure/admin/views/testtrackproimport/testtrackpro_xmlimport.jsp</view>
+ <view name="success">/secure/admin/views/testtrackproimport/testtrackpro_xmlimport.jsp</view>
+ </action>
+
+ <action name="util.CsvImporter" alias="CsvImport" roles-required="admin">
+ <view name="error">/secure/admin/views/importers/csv/csvimport.jsp</view>
+ <view name="input">/secure/admin/views/importers/csv/csvimport.jsp</view>
+ <view name="settings">/secure/admin/views/importers/csv/importsettings.jsp</view>
+ <view name="logs">/secure/admin/views/importers/csv/viewlogs.jsp</view>
+ <view name="finished">/secure/admin/views/importers/csv/finishedimport.jsp</view>
+ <view name="success">/secure/admin/views/importers/csv/csvimport.jsp</view>
+ </action>
+
+ <action name="util.csv.ConfigureCsvMapping" alias="ConfigureCsvMapping" roles-required="admin">
+ <view name="error">/secure/admin/views/importers/csv/csvconfig.jsp</view>
+ <view name="input">/secure/admin/views/importers/csv/csvconfig.jsp</view>
+ <view name="1">/secure/admin/views/importers/csv/configproject.jsp</view>
+ <view name="2">/secure/admin/views/importers/csv/configissuemapping.jsp</view>
+ <view name="3">/secure/admin/views/importers/csv/configvaluemapping.jsp</view>
+ <view name="5">/secure/admin/views/importers/csv/savepropertiesfile.jsp</view>
+ <view name="4">/secure/admin/views/importers/csv/configdateuserdefaults.jsp</view>
+ <view name="success">/secure/admin/views/importers/csv/csvimport.jsp</view>
+ <view name="importwithoutsaving">CsvImport!settings.jspa</view>
+ </action>
+
+ <!-- <action name="util.IdsImporter" alias="IdsImport" roles-required="admin">-->
+ <!-- <view name="input">/secure/admin/views/importers/importcsv.jsp</view>-->
+ <!-- <view name="success">/secure/admin/views/importers/importcsv.jsp</view>-->
+ <!-- </action>-->
+ <!-- <action name="util.XmlImporter" alias="XmlImport" roles-required="admin">-->
+ <!-- <view name="input">/secure/admin/views/importers/xmlimport.jsp</view>-->
+ <!-- <view name="success">/secure/admin/views/importers/xmlimport.jsp</view>-->
+ <!-- </action>-->
+
+ <action name="util.ShowConstantsHelp" alias="ShowConstantsHelp" roles-required="use">
+ <view name="success">/secure/showconstantshelp.jsp</view>
+ </action>
+
+ <action name="util.JellyRunner" alias="JellyRunner" roles-required="admin">
+ <view name="input">/secure/admin/views/jelly_runner.jsp</view>
+ <view name="error">/secure/admin/views/jelly_runner.jsp</view>
+ <view name="success">/secure/admin/views/jelly_result.jsp</view>
+ </action>
+
+ <!-- JIRA Administration -->
+ <action name="admin.ViewPlugins" alias="ViewPlugins" roles-required="admin">
+ <view name="input">/secure/admin/views/plugins/viewplugins.jsp</view>
+ <view name="success">/secure/admin/views/plugins/viewplugins.jsp</view>
+ </action>
+
+ <action name="admin.ViewListeners" alias="ViewListeners" roles-required="admin">
+ <view name="input">/secure/admin/views/listeners/viewlisteners.jsp</view>
+ <view name="success">/secure/admin/views/listeners/viewlisteners.jsp</view>
+ </action>
+
+ <action name="admin.EditListener" alias="EditListener" roles-required="admin">
+ <view name="input">/secure/admin/views/listeners/editlistener.jsp</view>
+ <view name="error">/secure/admin/views/listeners/editlistener.jsp</view>
+ </action>
+
+ <action name="admin.ViewServices" alias="ViewServices" roles-required="admin">
+ <view name="input">/secure/admin/views/services/viewservices.jsp</view>
+ <view name="success">/secure/admin/views/services/viewservices.jsp</view>
+ </action>
+
+ <action name="admin.EditService" alias="EditService" roles-required="admin">
+ <view name="input">/secure/admin/views/services/editservice.jsp</view>
+ <view name="error">/secure/admin/views/services/editservice.jsp</view>
+ </action>
+
+ <action name="admin.linking.ViewLinkTypes" alias="ViewLinkTypes" roles-required="admin">
+ <view name="input">/secure/admin/jira/views/viewlinktypes.jsp</view>
+ <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view>
+ <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view>
+
+ <command name="activate" alias="IssueLinkingActivate">
+ <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view>
+ <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view>
+ </command>
+ <command name="deactivate" alias="IssueLinkingDeActivate">
+ <view name="success">/secure/admin/jira/views/viewlinktypes.jsp</view>
+ <view name="error">/secure/admin/jira/views/viewlinktypes.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.linking.EditLinkType" alias="EditLinkType" roles-required="admin">
+ <view name="input">/secure/admin/jira/views/editlinktype.jsp</view>
+ <view name="error">/secure/admin/jira/views/editlinktype.jsp</view>
+ </action>
+
+ <action name="admin.linking.DeleteLinkType" alias="DeleteLinkType" roles-required="admin">
+ <view name="input">/secure/admin/jira/views/deletelinktype.jsp</view>
+ <view name="error">/secure/admin/jira/views/deletelinktype.jsp</view>
+ </action>
+
+ <action name="admin.ViewApplicationProperties" alias="ViewApplicationProperties" roles-required="admin">
+ <view name="success">/secure/admin/jira/views/applicationproperties.jsp</view>
+ </action>
+
+ <action name="admin.ViewAttachmentSettings" alias="ViewAttachmentSettings" roles-required="admin">
+ <view name="success">/secure/admin/jira/views/attachments.jsp</view>
+ </action>
+
+ <action name="admin.SchedulerAdmin" alias="SchedulerAdmin" roles-required="admin">
+ <view name="success">/secure/admin/jira/views/scheduleradmin.jsp</view>
+ </action>
+
+ <action name="admin.MailQueueAdmin" alias="MailQueueAdmin" roles-required="admin">
+ <view name="input">/secure/admin/jira/views/mailqueueadmin.jsp</view>
+ <view name="success">/secure/admin/jira/views/mailqueueadmin.jsp</view>
+ </action>
+
+ <action name="admin.IndexAdminImpl" alias="IndexAdmin" roles-required="admin">
+ <view name="success">/secure/admin/jira/views/indexing.jsp</view>
+ <view name="error">/secure/admin/jira/views/indexing.jsp</view>
+
+ <command name="reindex" alias="IndexReIndex">
+ <view name="success">/secure/admin/jira/views/indexing.jsp</view>
+ <view name="error">/secure/admin/jira/views/indexing.jsp</view>
+ </command>
+ <command name="activate" alias="IndexActivate">
+ <view name="success">/secure/admin/jira/views/indexing.jsp</view>
+ <view name="error">/secure/admin/jira/views/indexing.jsp</view>
+ </command>
+ <command name="deactivate" alias="IndexDeActivate">
+ <view name="success">/secure/admin/jira/views/indexing.jsp</view>
+ <view name="error">/secure/admin/jira/views/indexing.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.TimeTrackingAdmin" alias="TimeTrackingAdmin" roles-required="admin">
+ <view name="success">/secure/admin/jira/views/timetracking.jsp</view>
+ <view name="error">/secure/admin/jira/views/timetracking.jsp</view>
+
+ <command name="activate" alias="TimeTrackingActivate">
+ <view name="success">/secure/admin/jira/views/timetracking.jsp</view>
+ <view name="error">/secure/admin/jira/views/timetracking.jsp</view>
+ </command>
+ <command name="deactivate" alias="TimeTrackingDeActivate">
+ <view name="success">/secure/admin/jira/views/timetracking.jsp</view>
+ <view name="error">/secure/admin/jira/views/timetracking.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.TrackbackAdmin" alias="TrackbackAdmin" roles-required="admin">
+ <view name="success">/secure/admin/jira/views/trackback.jsp</view>
+ <view name="input">/secure/admin/jira/views/edittrackback.jsp</view>
+ <view name="error">/secure/admin/jira/views/edittrackback.jsp</view>
+
+ <command name="activate" alias="TrackbackActivate">
+ <view name="success">/secure/admin/jira/views/trackback.jsp</view>
+ <view name="error">/secure/admin/jira/views/trackback.jsp</view>
+ </command>
+ <command name="deactivate" alias="TrackbackDeActivate">
+ <view name="success">/secure/admin/jira/views/trackback.jsp</view>
+ <view name="error">/secure/admin/jira/views/trackback.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.ConfigureDefaultPortal" alias="EditDefaultDashboard" roles-required="admin">
+ <view name="input">/secure/admin/views/editdefaultdashboardconfig.jsp</view>
+ <view name="error">/secure/admin/views/editdefaultdashboardconfig.jsp</view>
+ </action>
+
+ <action name="admin.AddDefaultPortlet" alias="AddDefaultPortlet" roles-required="admin">
+ <view name="error">/secure/admin/views/editdefaultdashboardconfig.jsp</view>
+ <view name="input">/secure/admin/views/adddefaultportlet.jsp</view>
+ </action>
+
+ <action name="admin.SaveDefaultConfiguration" alias="SaveDefaultPortlet" roles-required="admin">
+ <view name="input">/secure/admin/views/configuredefaultportlet.jsp</view>
+ </action>
+
+ <action name="admin.ViewLicense" alias="ViewLicense" roles-required="admin">
+ <view name="success">/secure/admin/jira/views/viewlicense.jsp</view>
+ <view name="input">/secure/admin/jira/views/viewlicense.jsp</view>
+ <view name="error">/secure/admin/jira/views/viewlicense.jsp</view>
+ <view name="oldlicense">/secure/errors.jsp</view>
+ </action>
+
+ <action name="admin.EditApplicationProperties" alias="EditApplicationProperties" roles-required="admin">
+ <view name="error">/secure/admin/jira/views/editapplicationproperties.jsp</view>
+ <view name="input">/secure/admin/jira/views/editapplicationproperties.jsp</view>
+ </action>
+
+ <action name="admin.EditAttachmentSettings" alias="EditAttachmentSettings" roles-required="admin">
+ <view name="error">/secure/admin/jira/views/editattachmentsettings.jsp</view>
+ <view name="input">/secure/admin/jira/views/editattachmentsettings.jsp</view>
+ </action>
+
+ <action name="admin.GlobalPermissions" alias="GlobalPermissions" roles-required="admin">
+ <view name="success">/secure/admin/jira/views/globalpermissions.jsp</view>
+ <view name="error">/secure/admin/jira/views/globalpermissions.jsp</view>
+ </action>
+
+ <action name="admin.ViewLookAndFeel" alias="ViewLookAndFeel" roles-required="admin">
+ <view name="success">/secure/admin/jira/views/lookandfeel.jsp</view>
+ </action>
+
+ <action name="admin.EditLookAndFeel" alias="EditLookAndFeel" roles-required="admin">
+ <view name="input">/secure/admin/jira/views/editlookandfeel.jsp</view>
+ <view name="error">/secure/admin/jira/views/editlookandfeel.jsp</view>
+ </action>
+
+ <action name="admin.ConfigureIssueCache" alias="ConfigureCache" roles-required="admin">
+ <command name="viewCacheConfig" alias="ViewCacheConfig">
+ <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view>
+ </command>
+ <command name="flushCache" alias="FlushIssueCache">
+ <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view>
+ </command>
+ <command name="chooseCacheCapacity" alias="ChooseCacheCapacity">
+ <view name="input">/secure/admin/views/editcacheconfiguration.jsp</view>
+ </command>
+ <command name="flushStats" alias="ResetCacheStats">
+ <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view>
+ </command>
+ <command name="setCacheCapacity" alias="SetCacheCapacity">
+ <view name="success">/secure/admin/views/viewcacheconfiguration.jsp</view>
+ <view name="error">/secure/admin/views/editcacheconfiguration.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.ViewSystemInfo" alias="ViewSystemInfo" roles-required="admin">
+ <view name="success">/secure/admin/jira/views/systeminfo.jsp</view>
+ </action>
+
+ <action name="admin.JiraSupportRequest" alias="JiraSupportRequest" roles-required="admin">
+ <view name="input">/secure/admin/jira/views/jirasupportrequest.jsp</view>
+ <view name="success">/secure/admin/jira/views/jirasupportrequest.jsp</view>
+ </action>
+
+ <action name="admin.SetupLicense" alias="SetupLicense">
+ <view name="success">/views/setuplicense.jsp</view>
+ <view name="error">/views/setuplicense.jsp</view>
+ </action>
+
+ <action name="admin.ConfirmNewInstallationWithOldLicense" alias="ConfirmNewInstallationWithOldLicense">
+ <view name="success">/views/confirmnewinstallationwitholdlicense.jsp</view>
+ <view name="error">/views/confirmnewinstallationwitholdlicense.jsp</view>
+ </action>
+
+ <!-- Constants Administration -->
+ <action name="admin.priorities.ViewPriorities" alias="ViewPriorities" roles-required="admin">
+ <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view>
+ <command name="addPriority" alias="AddPriority">
+ <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view>
+ <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view>
+ </command>
+ <command name="moveDown" alias="PriorityDown">
+ <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view>
+ <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view>
+ </command>
+ <command name="moveUp" alias="PriorityUp">
+ <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view>
+ <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view>
+ </command>
+ <command name="makeDefault" alias="MakeDefaultPriority">
+ <view name="success">/secure/admin/views/priorities/viewpriorities.jsp</view>
+ <view name="error">/secure/admin/views/priorities/viewpriorities.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.priorities.EditPriority" alias="EditPriority" roles-required="admin">
+ <view name="input">/secure/admin/views/priorities/editpriority.jsp</view>
+ <view name="error">/secure/admin/views/priorities/editpriority.jsp</view>
+ </action>
+
+ <action name="admin.priorities.DeletePriority" alias="DeletePriority" roles-required="admin">
+ <view name="input">/secure/admin/views/priorities/deletepriority.jsp</view>
+ <view name="error">/secure/admin/views/priorities/deletepriority.jsp</view>
+ </action>
+
+ <action name="admin.resolutions.ViewResolutions" alias="ViewResolutions" roles-required="admin">
+ <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view>
+ <command name="addConstant" alias="AddResolution">
+ <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view>
+ <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view>
+ </command>
+ <command name="moveDown" alias="ResolutionDown">
+ <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view>
+ <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view>
+ </command>
+ <command name="moveUp" alias="ResolutionUp">
+ <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view>
+ <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view>
+ </command>
+ <command name="makeDefault" alias="MakeDefaultResolution">
+ <view name="success">/secure/admin/views/resolutions/viewresolutions.jsp</view>
+ <view name="error">/secure/admin/views/resolutions/viewresolutions.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.resolutions.EditResolution" alias="EditResolution" roles-required="admin">
+ <view name="input">/secure/admin/views/resolutions/editresolution.jsp</view>
+ <view name="error">/secure/admin/views/resolutions/editresolution.jsp</view>
+ </action>
+
+ <action name="admin.resolutions.DeleteResolution" alias="DeleteResolution" roles-required="admin">
+ <view name="input">/secure/admin/views/resolutions/deleteresolution.jsp</view>
+ <view name="error">/secure/admin/views/resolutions/deleteresolution.jsp</view>
+ </action>
+
+ <action name="admin.issuefields.ViewIssueFields" alias="ViewIssueFields" roles-required="admin">
+ <view name="success">/secure/admin/views/viewissuefields.jsp</view>
+ <command name="moveDown" alias="IssueFieldDown">
+ <view name="success">/secure/admin/views/viewissuefields.jsp</view>
+ <view name="error">/secure/admin/views/viewissuefields.jsp</view>
+ </command>
+ <command name="moveUp" alias="IssueFieldUp">
+ <view name="success">/secure/admin/views/viewissuefields.jsp</view>
+ <view name="error">/secure/admin/views/viewissuefields.jsp</view>
+ </command>
+ <command name="hide" alias="IssueFieldHide">
+ <view name="success">/secure/admin/views/viewissuefields.jsp</view>
+ <view name="error">/secure/admin/views/viewissuefields.jsp</view>
+ </command>
+ <command name="require" alias="IssueFieldRequire">
+ <view name="success">/secure/admin/views/viewissuefields.jsp</view>
+ <view name="error">/secure/admin/views/viewissuefields.jsp</view>
+ </command>
+ <command name="restoreDefaults" alias="RestoreDefaults">
+ <view name="success">/secure/admin/views/viewissuefields.jsp</view>
+ <view name="error">/secure/admin/views/viewissuefields.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.issuefields.EditDefaultFieldLayoutItem" alias="EditDefaultFieldLayoutItem" roles-required="admin">
+ <view name="input">/secure/admin/views/issuefields/editdefaultfieldlayoutitem.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/editdefaultfieldlayoutitem.jsp</view>
+ </action>
+
+ <action name="admin.issuefields.enterprise.ViewSchemes" alias="ViewFieldLayoutSchemes" roles-required="admin">
+ <view name="success">/secure/admin/views/issuefields/viewfieldlayoutschemes.jsp</view>
+
+ <command name="addScheme" alias="AddFieldLayoutScheme">
+ <view name="error">/secure/admin/views/issuefields/viewfieldlayoutschemes.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.issuefields.enterprise.EditFieldLayoutScheme" alias="EditFieldLayoutScheme" roles-required="admin">
+ <view name="input">/secure/admin/views/issuefields/editfieldlayoutscheme.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/editfieldlayoutscheme.jsp</view>
+
+ <command name="deleteScheme" alias="DeleteFieldLayoutScheme">
+ <view name="confirm">/secure/admin/views/issuefields/deletefieldlayoutscheme.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/deletefieldlayoutscheme.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.issuefields.enterprise.CopyFieldLayoutScheme" alias="CopyFieldLayoutScheme" roles-required="admin">
+ <view name="input">/secure/admin/views/issuefields/copyfieldlayoutscheme.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/copyfieldlayoutscheme.jsp</view>
+ </action>
+
+ <action name="admin.issuefields.enterprise.ConfigureFieldLayoutScheme" alias="ConfigureFieldLayoutScheme" roles-required="admin">
+ <view name="error">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view>
+ <view name="success">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view>
+
+ <command name="addFieldLayoutSchemeEntity" alias="AddFieldLayoutSchemeEntity">
+ <view name="error">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view>
+ </command>
+
+ <command name="deleteFieldLayoutSchemeEntity" alias="DeleteFieldLayoutSchemeEntity">
+ <view name="error">/secure/admin/views/issuefields/configurefieldlayoutscheme.jsp</view>
+ </command>
+
+ <command name="editFieldLayoutSchemeEntity" alias="EditFieldLayoutSchemeEntity">
+ <view name="input">/secure/admin/views/issuefields/editfieldlayoutschemeentity.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/editfieldlayoutschemeentity.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.issuefields.enterprise.SelectFieldLayoutScheme" alias="SelectFieldLayoutScheme" roles-required="admin">
+ <view name="input">/secure/project/views/issuefields/selectfieldlayoutscheme.jsp</view>
+ <view name="error">/secure/project/views/issuefields/selectfieldlayoutscheme.jsp</view>
+ </action>
+
+ <action name="admin.issuefields.enterprise.ViewFieldLayouts" alias="ViewFieldLayouts" roles-required="admin">
+ <view name="success">/secure/admin/views/issuefields/viewfieldlayouts.jsp</view>
+
+ <command name="addFieldLayout" alias="AddFieldLayout">
+ <view name="error">/secure/admin/views/issuefields/viewfieldlayouts.jsp</view>
+ </command>
+
+ <command name="deleteFieldLayout" alias="DeleteFieldLayout">
+ <view name="confirm">/secure/admin/views/issuefields/confirmdeletefieldlayout.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/confirmdeletefieldlayout.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.issuefields.enterprise.EditFieldLayout" alias="EditFieldLayout" roles-required="admin">
+ <view name="input">/secure/admin/views/issuefields/editfieldlayout.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/editfieldlayout.jsp</view>
+ </action>
+
+ <action name="admin.issuefields.enterprise.CopyFieldLayout" alias="CopyFieldLayout" roles-required="admin">
+ <view name="input">/secure/admin/views/issuefields/copyfieldlayout.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/copyfieldlayout.jsp</view>
+ </action>
+
+ <action name="admin.issuefields.enterprise.ConfigureFieldLayout" alias="ConfigureFieldLayout" roles-required="admin">
+ <view name="input">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ <command name="moveDown" alias="EditFieldLayoutDown">
+ <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ </command>
+ <command name="moveUp" alias="EditFieldLayoutUp">
+ <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ </command>
+ <command name="hide" alias="EditFieldLayoutHide">
+ <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ </command>
+ <command name="require" alias="EditFieldLayoutRequire">
+ <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ </command>
+ <command name="restoreDefaults" alias="EditFieldLayoutRestoreDefaults">
+ <view name="success">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/configurefieldlayout.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.issuefields.enterprise.EditFieldLayoutItem" alias="EditFieldLayoutItem" roles-required="admin">
+ <view name="input">/secure/admin/views/issuefields/editfieldlayoutitem.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/editfieldlayoutitem.jsp</view>
+ </action>
+
+ <!-- Field Screens -->
+ <action name="admin.issuefields.screens.ViewFieldScreens" alias="ViewFieldScreens" roles-required="admin">
+ <view name="error">/secure/admin/views/issuefields/screens/viewfieldscreens.jsp</view>
+ <view name="success">/secure/admin/views/issuefields/screens/viewfieldscreens.jsp</view>
+
+ <command name="addFieldScreen" alias="AddFieldScreen">
+ <view name="error">/secure/admin/views/issuefields/screens/viewfieldscreens.jsp</view>
+ </command>
+
+ <command name="deleteFieldScreen" alias="DeleteFieldScreen">
+ <view name="confirm">/secure/admin/views/issuefields/screens/confirmdeletefieldscreen.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/screens/confirmdeletefieldscreen.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.issuefields.screens.EditFieldScreen" alias="EditFieldScreen" roles-required="admin">
+ <view name="input">/secure/admin/views/issuefields/screens/editfieldscreen.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/screens/editfieldscreen.jsp</view>
+
+ <command name="copyFieldScreen" alias="CopyFieldScreen">
+ <view name="input">/secure/admin/views/issuefields/screens/copyfieldscreen.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/screens/copyfieldscreen.jsp</view>
+ </command>
+ </action>
+
+ <action name="admin.issuefields.screens.AssociateFieldToScreens" alias="AssociateFieldToScreens" roles-required="admin">
+ <view name="input">/secure/admin/views/issuefields/screens/associatefield.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/screens/associatefield.jsp</view>
+ </action>
+
+ <action name="admin.issuefields.screens.ConfigureFieldScreen" alias="ConfigureFieldScreen" roles-required="admin">
+ <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view>
+ <view name="success">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view>
+
+ <command name="deleteField" alias="DeleteFieldScreenLayoutItem">
+ <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view>
+ </command>
+
+ <command name="addField" alias="AddFieldScreenLayoutItem">
+ <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view>
+ </command>
+
+ <command name="addTab" alias="AddFieldScreenTab">
+ <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view>
+ </command>
+
+ <command name="deleteTab" alias="DeleteFieldScreenTab">
+ <view name="confirm">/secure/admin/views/issuefields/screens/confirmdeletefieldscreentab.jsp</view>
+ <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view>
+ </command>
+
+ <command name="renameTab" alias="RenameFieldScreenTab">
+ <view name="error">/secure/admin/views/issuefields/screens/configurefieldscreen.jsp</view>
+ ...
[truncated message content] |
Author: ral...@jb...
Date: 2005-08-26 13:14:14 -0400 (Fri, 26 Aug 2005)
New Revision: 978
Modified:
trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java
trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
Log:
images fixed
Modified: trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java
===================================================================
--- trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java 2005-08-26 17:03:45 UTC (rev 977)
+++ trunk/forge/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/FileAccessFilter.java 2005-08-26 17:14:14 UTC (rev 978)
@@ -51,6 +51,11 @@
*/
private final static String DOCS_ACCESS = "/docs/";
/**
+ * <code>FREEZONE_ACCESS</code> - another directory from which files are
+ * enabled to download.
+ */
+ private final static String FREEZONE_ACCESS = "/freezone/";
+ /**
* <code>BUF_SIZE</code> - size of a buffer, which is used while reading a
* file and sending it to the client.
*/
@@ -82,7 +87,8 @@
if ((toCheck.indexOf(IMAGES_ACCESS) != -1)
|| (toCheck.indexOf(DOWNLOADS_ACCESS) != -1)
- || (toCheck.indexOf(DOCS_ACCESS) != -1)) {
+ || (toCheck.indexOf(DOCS_ACCESS) != -1)
+ || (toCheck.indexOf(FREEZONE_ACCESS) != -1)) {
// Allowing access to images, downloads and docs
} else
// Not images, nor downloads - wrong request.
Modified: trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 17:03:45 UTC (rev 977)
+++ trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 17:14:14 UTC (rev 978)
@@ -94,8 +94,8 @@
// modifies path to page/resource so folder structure can be supported
private String modifyPath(String path, String element) {
- System.out.println("element is: "+ element);
- System.out.println("path is: "+ path);
+ // System.out.println("element is: "+ element);
+ // System.out.println("path is: "+ path);
int start, end;
String mainPath = "";
@@ -106,7 +106,7 @@
}
else {
mainPath = path.substring(0, pre);
- System.out.println("main path is: " + mainPath);
+ // System.out.println("main path is: " + mainPath);
}//main path to page
@@ -181,6 +181,11 @@
{
pageContent = forgeHelper.replace(pageContent,"HREF=", "href=");
}
+
+ while(pageContent.indexOf("<IMG SRC=")!= -1)
+ {
+ pageContent = forgeHelper.replace(pageContent,"<IMG SRC=", "<img src=");
+ }
// Replacing links
while ((nextRef = findNextReference(pageContent, "link")) != null) {
@@ -203,8 +208,10 @@
String imagePrepend = "/file-access/" + portalName + "/"
+ ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"+ProjectsHelper.FREEZONE_DIR+"/";
while ((nextRef = findNextReference(pageContent, "image")) != null)
+ {
+ nextRef2 = modifyPath(pagePath, nextRef);
pageContent = forgeHelper.replace(pageContent, "<img src="+'"'
- + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef+'"');
+ + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef2+'"');}
//fix back internal links
while (pageContent.indexOf(" /portal/index.html?ctrl:id") != -1)
|
Author: dam...@jb... Date: 2005-08-26 13:03:45 -0400 (Fri, 26 Aug 2005) New Revision: 977 Added: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties Removed: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java Modified: qa/forge/portal-extensions/forge-jspwiki/maven.xml qa/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css qa/forge/portal-extensions/forge-wiki/project.xml qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp qa/forge/portal-extensions/jspwiki/maven.xml qa/forge/portal-extensions/maven.xml Log: MERGED: -r 964:976 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. Beginning QA tests and waiting on Rali. Modified: qa/forge/portal-extensions/forge-jspwiki/maven.xml =================================================================== --- qa/forge/portal-extensions/forge-jspwiki/maven.xml 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-jspwiki/maven.xml 2005-08-26 17:03:45 UTC (rev 977) @@ -9,15 +9,15 @@ </goal> <goal name="build"> - <attainGoal name="copy-tld" /> - <attainGoal name="war" /> + <!--<attainGoal name="copy-tld" /> + <attainGoal name="war" />--> </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: qa/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java =================================================================== --- qa/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java 2005-08-26 17:03:45 UTC (rev 977) @@ -43,7 +43,7 @@ /** * In the given content, finds a first string of the form: - * ${refName:some-text}, and returns the text inside the reference. + * <link ... href=, and returns the text inside the reference. * * @param content * String in which to look for the reference. @@ -78,6 +78,20 @@ else return null; } + + /** + * Figures out if a link is an off-site link. This recognizes the most + * common protocols by checking how it starts. (clears all white space in + * case the link starts with '\n' or [space] + * + * @author Janne Jalkanen + */ + private boolean isExternalLink(String link) { + link = link.trim(); + return link.startsWith("http:") || link.startsWith("ftp:") + || link.startsWith("https:") || link.startsWith("mailto:") + || link.startsWith("news:") || link.startsWith("file:"); + } public void doView(JBossRenderRequest request, JBossRenderResponse response) throws IOException { @@ -114,7 +128,8 @@ // Replacing links while ((nextRef = findNextReference(pageContent, "link")) != null) { - if (nextRef.indexOf("http://") == -1) + if(!isExternalLink(nextRef)) + //if (nextRef.indexOf("http://") == -1) //it would be relative not outside link pageContent = forgeHelper.replace(pageContent, "href=" + '"' + nextRef + '"', @@ -141,7 +156,12 @@ //fix back external links - while (pageContent.indexOf("$http:") != -1 ) + while (pageContent.indexOf("$http:") != -1 + || pageContent.indexOf("$ftp:") != -1 + || pageContent.indexOf("$https:") != -1 + || pageContent.indexOf("$file:") != -1 + || pageContent.indexOf("$mailto:") != -1 + || pageContent.indexOf("$news:") != -1) {pageContent = forgeHelper.replace(pageContent, "$", " href=" + '"');} //fix back image links Modified: qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java =================================================================== --- qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 17:03:45 UTC (rev 977) @@ -41,7 +41,7 @@ /** * In the given content, finds a first string of the form: - * ${refName:some-text}, and returns the text inside the reference. + * <link ... href=, and returns the text inside the reference. * * @param content * String in which to look for the reference. @@ -50,17 +50,98 @@ * @return Text contained in the reference or null if no reference is found. */ private String findNextReference(String content, String refName) { - int start = content.indexOf("${" + refName + ":"); - if (start == -1) + int h, ch; + int start; + if (refName.equals("link")) { + h = content.indexOf(" href="); //search for one of the link types + if (h == -1) + { + return null; + } + else start = h; + int begin = content.substring(start).indexOf('"'); + int end = content.substring(start + begin + 1).indexOf('"'); + begin += start; + end += begin; + return content.substring(begin + 1, end + 1); + } + else if(refName.equals("image")) + { + start=content.indexOf("<img src="); + if (start == -1) + return null; + int begin = content.substring(start).indexOf('"'); + int end=content.substring(start+begin+1).indexOf('"'); + begin+=start; end+=begin; + return content.substring(begin+1, end+1);} + else return null; - - int stop = content.substring(start).indexOf('}'); - if (stop == -1) - return null; + } + + /** + * Figures out if a link is an off-site link. This recognizes the most + * common protocols by checking how it starts. (clears all white space in + * case the link starts with '\n' or [space] + * + * @author Janne Jalkanen + */ + private boolean isExternalLink(String link) { + link = link.trim(); + return link.startsWith("http:") || link.startsWith("ftp:") + || link.startsWith("https:") || link.startsWith("mailto:") + || link.startsWith("news:") || link.startsWith("file:"); + } + +// modifies path to page/resource so folder structure can be supported + private String modifyPath(String path, String element) { + System.out.println("element is: "+ element); + System.out.println("path is: "+ path); + int start, end; + String mainPath = ""; - stop += start; + int pre = path.lastIndexOf('/'); + if(pre== -1)//we are in root dir + { + return element; + } + else { + mainPath = path.substring(0, pre); + System.out.println("main path is: " + mainPath); + }//main path to page + + + if (element.startsWith("/")) + return element.substring(1); //base path, start with WEB-root - return content.substring(start + 2 + refName.length() + 1, stop); + if (element.startsWith("./")) + element = element.substring(1);//ignore ./ only clutters the code + if (element.indexOf('/') != -1) { + if (element.indexOf("../") != -1)//need to go up a few levels + { + while (element.indexOf("../") != -1) //do we need to go more + { + if (mainPath.equals("")) + return DEFAULT_PAGE; //trying to go too far up + else { + start = element.lastIndexOf("../");//go one level up + end = mainPath.lastIndexOf("/");//find last level + element = element.substring(0, start) + //+ mainPath + // .substring(end, mainPath.length()) + + element + .substring(start + 3, element.length()); + // System.out.println("element is: " + element); + mainPath = mainPath.substring(0, end); + // System.out.println("mainPath is: " + mainPath); + }//else + + }//while + + }//if ../ + + } + + return mainPath + '/' + element; } public void doView(JBossRenderRequest request, JBossRenderResponse response) @@ -95,24 +176,62 @@ throw new Exception(); String nextRef; + String nextRef2; + while(pageContent.indexOf("HREF=")!= -1) + { + pageContent = forgeHelper.replace(pageContent,"HREF=", "href="); + } - // Replacing links - while ((nextRef = findNextReference(pageContent, "link")) != null) - pageContent = forgeHelper.replace(pageContent, "${link:" - + nextRef + "}", projectsHelper.createFreezonePageLink( - portalName, projectId, nextRef)); +// Replacing links + while ((nextRef = findNextReference(pageContent, "link")) != null) { + if(!isExternalLink(nextRef)) + { + //it would be relative not outside link + nextRef2 = modifyPath(pagePath, nextRef); + pageContent = forgeHelper.replace(pageContent, "href=" + + '"' + nextRef + '"', + projectsHelper.createFreezonePageLink(portalName, + projectId, nextRef2) + '"'); + } + else { + pageContent = forgeHelper.replace(pageContent, "href=" + + '"' + nextRef, "$"+nextRef+'"'); + } + } // Replacing images String imagePrepend = "/file-access/" + portalName + "/" - + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"; + + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"+ProjectsHelper.FREEZONE_DIR+"/"; while ((nextRef = findNextReference(pageContent, "image")) != null) - pageContent = forgeHelper.replace(pageContent, "${image:" - + nextRef + "}", imagePrepend + nextRef); + pageContent = forgeHelper.replace(pageContent, "<img src="+'"' + + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef+'"'); + + //fix back internal links + while (pageContent.indexOf(" /portal/index.html?ctrl:id") != -1) + pageContent = forgeHelper.replace(pageContent, + " /portal/index.html?ctrl:id", " href=" + '"' + + "/portal/index.html?ctrl:id"); + //fix back external links + + while (pageContent.indexOf("$http:") != -1 + || pageContent.indexOf("$ftp:") != -1 + || pageContent.indexOf("$https:") != -1 + || pageContent.indexOf("$file:") != -1 + || pageContent.indexOf("$mailto:") != -1 + || pageContent.indexOf("$news:") != -1) + {pageContent = forgeHelper.replace(pageContent, "$", + " href=" + '"');} + //fix back image links + while (pageContent.indexOf("*img src=") != -1 ) + {pageContent = forgeHelper.replace(pageContent, "*img src=", + "<img src=");} + response.getWriter().write(pageContent); } catch (Exception e) { response.getWriter().write( - "The page you requested cannot be accessed"); + "The page you requested cannot be accessed due to " + + e.toString()); } } } Modified: qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css =================================================================== --- qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css 2005-08-26 17:03:45 UTC (rev 977) @@ -16,8 +16,8 @@ p { line-height: 150%; } pre { font-family: Andale Mono, Courier New, Courier, monospace; } -code { font: 11px Andale Mono, Courier New, Courier, monospace; line-height: 110%; white-space: pre; padding: 5px; margin: 5px; background-color: #efefef; width: 550px; overflow: visible; } + hr { color: #6e6e6e; } Modified: qa/forge/portal-extensions/forge-wiki/project.xml =================================================================== --- qa/forge/portal-extensions/forge-wiki/project.xml 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/project.xml 2005-08-26 17:03:45 UTC (rev 977) @@ -10,15 +10,30 @@ <id>wiki</id> <name>Wiki portlet</name> <currentVersion>1.0</currentVersion> - <!--<build> - <unitTestSourceDirectory>./src/test/java</unitTestSourceDirectory> - <unitTest> - <includes> - <include>**/*Test.java</include> - <include>**/Test*.java</include> - </includes> - </unitTest> - </build>--> + <build> + <unitTestSourceDirectory>./src/test/java</unitTestSourceDirectory> + <unitTest> + <includes> + <include>**/*Test.java</include> + <include>**/Test*.java</include> + </includes> + </unitTest> + <sourceDirectory>src/java</sourceDirectory> + <resources> + <resource> + <directory>src/etc/</directory> + <include>**/*.properties</include> + </resource> + <resource> + <directory>src/etc/</directory> + <include>**/*.xml</include> + </resource> + <resource> + <directory>src/etc/</directory> + <include>**/*.types</include> + </resource> + </resources> + </build> <organization> <name>Tomasz Szymanski</name> <url>http://mamut.net.pl</url> @@ -69,22 +84,4 @@ </dependency> </dependencies> - - <build> - <sourceDirectory>src/java</sourceDirectory> - <resources> - <resource> - <directory>src/etc/</directory> - <include>**/*.properties</include> - </resource> - <resource> - <directory>src/etc/</directory> - <include>**/*.xml</include> - </resource> - <resource> - <directory>src/etc/</directory> - <include>**/*.types</include> - </resource> - </resources> - </build> </project> Modified: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-26 17:03:45 UTC (rev 977) @@ -24,10 +24,6 @@ <name>friendlyLinks</name> <class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class> </plugin> - <plugin> - <name>secureLinks</name> - <class>org.jboss.wiki.plugins.SecureLinksPlugin</class> - </plugin> </wikiType> <wikiType> <name>DIFF</name> @@ -45,6 +41,10 @@ <class>org.jboss.wiki.plugins.FindResultPlugin</class> </plugin> <plugin> + <name>trail</name> + <class>org.jboss.wiki.plugins.TrailPlugin</class> + </plugin> + <plugin> <name>wikiToHtmlTranslator</name> <class>org.jboss.wiki.plugins.HTMLTranslator</class> </plugin> Copied: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties (from rev 976, trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties) Deleted: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample 2005-08-26 17:03:45 UTC (rev 977) @@ -1,8 +0,0 @@ -# WikiPlugin properties. Use it wise. -#specifies base URL for the portal -htmlTranslatorURL = http://forge.sicore.org:8080/ -#htmlTranslatorURL = http://localhost:8080/ -#extensions for images to be inlined, coma-separated -imagePatterns = .png , .jpeg , .gif , .bmp -#wikiHome part of url. Leave it you use default portlet conifguration -wikiHome = index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-26 17:03:45 UTC (rev 977) @@ -44,7 +44,7 @@ } public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) { - + // wikiContext is null - to get refernece to actual page WikiContext wikiContext = null; @@ -73,8 +73,8 @@ // write the uploaded file to a new location String fieldName = item.getFieldName(); String fileName = item.getName(); - //String contentType = item.getContentType(); - //long size = item.getSize(); + // String contentType = item.getContentType(); + // long size = item.getSize(); /* * rResp .setRenderParameter("size", * Long.toString(size)); @@ -116,17 +116,18 @@ rResp.setRenderParameter("page", rReq.getParameter("page")); } - + if (rReq.getParameter("searchQuery") != null) { - //TODO do it man ! - Set<String> pages = wikiEngine.findPages(rReq.getParameter("searchQuery")); + // TODO do it man ! + Set<String> pages = wikiEngine.findPages(rReq + .getParameter("searchQuery")); rReq.getPortletSession().setAttribute("findResult", pages); - + // show the results rResp.setRenderParameter("page", "FindResult"); } - + if (rReq.getParameter("action") != null) { rResp.setRenderParameter("action", rReq.getParameter("action")); } @@ -196,8 +197,19 @@ public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes) throws PortletException, java.io.IOException { - rReq.getPortletSession().setAttribute("isSecure", new Boolean(rReq.isSecure())); + PortletURL wikiURL = rRes.createActionURL(); + + rReq.setAttribute("actionURL", wikiURL.toString()); + + // Create server host and put it into session for plugins + String hostURL = ((rReq.isSecure()) ? "https" : "http") + "://"+rReq.getServerName()+((rReq.getServerPort() == 80) ? "" : ":"+ rReq.getServerPort()); + rReq.getPortletSession().setAttribute("hostURL", hostURL); + rReq.getPortletSession().setAttribute("actionURL", wikiURL.toString()); + + rReq.getPortletSession().setAttribute("isSecure", + new Boolean(rReq.isSecure())); + WikiPage noSuchPage = new WikiPage("", new Credentials(""), "There is no such page. Click on EDIT to start it.", 0, 0, null, wikiEngine.getMediaDataSource()); @@ -218,7 +230,7 @@ && (rReq.getParameter("action").equals("Attach"))) { rReq.setAttribute("fileAttach", "true"); } - + if ((rReq.getParameter("action") != null) && (rReq.getParameter("action").equals("Edit")) && (rReq.getUser() != null)) { @@ -228,15 +240,15 @@ if (rReq.getParameter("version") != null) { // show previous version of page - + System.out.println("Getting page " + wikiPage + " at version " + rReq.getParameter("version")); pageToShow = wikiEngine.getByName(wikiPage, null, Integer .valueOf(rReq.getParameter("version"))); - + if (pageToShow.getLastVersion() != pageToShow.getVersion()) { rReq.setAttribute("showedVersion", Integer.valueOf(rReq - .getParameter("version"))); + .getParameter("version"))); } } else { pageToShow = wikiEngine.getByName(wikiPage, null); @@ -305,10 +317,10 @@ + rReq.getParameter("version")); pageToShow = wikiEngine.getByName(wikiPage, wikiContext, Integer.valueOf(rReq.getParameter("version"))); - + if (pageToShow.getLastVersion() != pageToShow.getVersion()) { rReq.setAttribute("showedVersion", Integer.valueOf(rReq - .getParameter("version"))); + .getParameter("version"))); } } else { pageToShow = wikiEngine.getByName(wikiPage, wikiContext); @@ -326,15 +338,11 @@ } } - - PortletURL wikiURL = rRes.createActionURL(); - - rReq.setAttribute("actionURL", wikiURL.toString()); rReq .setAttribute( "wikiName", - "<img src=\"/file-access/default/members/jbosswiki/images/JBossWikiLogoMedium.png\" width=\"100\" border=\"0\" />"); + "<img src=\"/file-access/default/members/jbosswiki/images/JBossWikiLogoMedium.png\" width=\"100\" border=\"0\" style=\"vertical-align: middle\"/>"); rReq.setAttribute("wikiContent", pageToShow.getContent()); @@ -346,22 +354,26 @@ rReq.setAttribute("logedIn", (rReq.getUser() != null) ? "true" : "false"); - + rReq.setAttribute("defaultPage", defaultPage); // FIXME make this more elegant (ie. plugin) // pass friendly link - Properties props = new Properties(); - props.load(WikiPlugin.class.getResourceAsStream("wikiPlugins.properties")); - String href = props.getProperty("htmlTranslatorURL")+"wiki/"+pageToShow.getName(); - - if (rReq.isSecure()) { - //change http to https - href = href.replaceFirst("http", "https"); - } - - rReq.setAttribute("friendlyLink", href); - + /*Properties props = new Properties(); + props.load(WikiPlugin.class + .getResourceAsStream("wikiPlugins.properties")); + String href = props.getProperty("htmlTranslatorURL") + "wiki/" + + pageToShow.getName(); + String[] replaces = props.getProperty("sslRedirectReplaces").split(","); + + if (rReq.isSecure() && (replaces.length % 2 == 0)) { + // chage normal url to secure + for (int i = 0; i < replaces.length; i += 2) + href = href.replaceAll(replaces[i], replaces[i + 1]); + }*/ + + rReq.setAttribute("friendlyLink", hostURL+"/wiki/"+pageToShow.getName()); + rRes.setTitle("Wiki"); if (javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState()) || javax.portlet.WindowState.MAXIMIZED.equals(rReq Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-26 17:03:45 UTC (rev 977) @@ -46,7 +46,9 @@ private String attachementsPath; - private String host; + private String wikiHome; + + private String[] replaces; /* * private ForgeHelper forgeHelper; private ContentManager contentManager; @@ -74,9 +76,8 @@ .getResourceAsStream("wikiPlugins.properties")); // get the host - host = props.getProperty("htmlTranslatorURL") + "portal/" - + props.getProperty("wikiHome"); - + wikiHome = props.getProperty("wikiHome"); + } catch (IOException e) { System.err.println(e); } @@ -100,12 +101,10 @@ System.out.println("length " + tokens.length); if (tokens.length == 3) { - // show page - System.out.println("redirecting: " + host + "&page=" + String hostURL = ((request.isSecure()) ? "https" : "http") + "://"+request.getServerName()+((request.getServerPort() == 80) ? "" : ":"+ request.getServerPort()); + + httpResponse.sendRedirect(hostURL+wikiHome + "&page=" + tokens[tokens.length - 1]); - - httpResponse.sendRedirect(host + "&page=" - + tokens[tokens.length - 1]); } else { // get fileName of attachement and page which is connected to String fileName = tokens[tokens.length - 1]; @@ -124,7 +123,7 @@ System.err.println(e); } - // looking for the newst version + // looking for the newest version int version = 1; while (props.getProperty((version + 1) + ".author") != null) { Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java 2005-08-26 17:03:45 UTC (rev 977) @@ -21,8 +21,10 @@ @Override public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) { + host = (String)wikiSession.getAttribute("hostURL")+"/wiki/"; + WikiPage newPage = null; - + try { newPage = (WikiPage) wikiPage.clone(); } catch (CloneNotSupportedException cl) { @@ -38,7 +40,7 @@ for (String s : attachements) { String href = host+newPage.getName() + "/" + s; - newContent += "<a href='"+href+"'>"+href + "</a><br>\n"; + newContent += "<a href=\""+href+"\">"+href + "</a><br>\n"; } newPage.setPageContent(newContent); @@ -50,7 +52,7 @@ @Override public void init() { - host = getProperty("htmlTranslatorURL")+"wiki/"; + } } Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-26 17:03:45 UTC (rev 977) @@ -37,6 +37,12 @@ @Override public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) { + url = (String)wikiSession.getAttribute("hostURL")+"/wiki/"; + + pattern = "<a href=\""+(((String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+\">"; + + System.out.println(pattern); + WikiPage newPage = null; try { @@ -52,11 +58,7 @@ @Override public void init() { - url = getProperty("htmlTranslatorURL")+"wiki/"; - pattern = "<a href=\""+((getProperty("htmlTranslatorURL")+"portal/"+getProperty("wikiHome")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+\">"; - - System.out.println(pattern); } } Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-26 17:03:45 UTC (rev 977) @@ -928,6 +928,11 @@ public WikiPage process(final WikiPage wikiPage, WikiSession wikiSession) { WikiPage newPage = null; + + portalHome = (String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL"); + wikiHome = ""; + imagePath = (String)wikiSession.getAttribute("hostURL") + "/wiki"; + try { newPage = (WikiPage) wikiPage.clone(); } catch (CloneNotSupportedException cnse) { @@ -950,10 +955,10 @@ @Override public void init() { - portalHome = getProperty("htmlTranslatorURL") + "portal/"; + //portalHome = getProperty("htmlTranslatorURL") + "portal/"; mediaPatterns = getProperty("imagePatterns"); - imagePath = getProperty("htmlTranslatorURL") + "wiki"; - wikiHome = getProperty("wikiHome"); + //imagePath = getProperty("htmlTranslatorURL") + "wiki"; + //wikiHome = getProperty("wikiHome"); } } \ No newline at end of file Deleted: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java 2005-08-26 17:03:45 UTC (rev 977) @@ -1,32 +0,0 @@ -package org.jboss.wiki.plugins; - -import org.jboss.wiki.WikiPage; -import org.jboss.wiki.WikiPlugin; -import org.jboss.wiki.WikiSession; - -public class SecureLinksPlugin extends WikiPlugin { - - @Override - public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) { - WikiPage newPage = null; - - try { - newPage = (WikiPage) wikiPage.clone(); - } catch (CloneNotSupportedException cl) { - System.err.println(cl); - } - - if (((Boolean)wikiSession.getAttribute("isSecure")) == true) { - newPage.setPageContent(newPage.getPageContent().replaceAll( - "<a href=\"http", "<a href=\"https")); - } - return newPage; - } - - @Override - public void init() { - // TODO Auto-generated method stub - - } - -} Modified: qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-26 17:03:45 UTC (rev 977) @@ -18,7 +18,15 @@ org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author"); %> -<h2><a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a>/ <%=wikiPage%> </h2> +<table style="width: 100%" border="0"> +<tr> +<td style="font-size: large"> +<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a> : <%=wikiPage%> +</td> +<td style="text-align: right;"> +[<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a>] +</td> +</table> <!--<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a><br />--> @@ -37,8 +45,8 @@ if ((type == null)||(type.equals("HTML"))) { if (logedIn.equals("true")) { - out.print("<a href='"+actionURL+"&action=Edit&page="+wikiPage+"'><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\"</img></a>\n"+ - "<a href=\""+actionURL+"&action=Attach\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\"</img></a>"); + out.print("<a href=\""+actionURL+"&action=Edit&page="+wikiPage+"\"><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\" /></a>\n"+ + "<a href=\""+actionURL+"&action=Attach&page="+wikiPage+"\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\" /></a>"); } else { @@ -50,7 +58,7 @@ <% if ((type == null)||(type.equals("HTML"))) { - out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\"/file-access/default/members/jbosswiki/images/historyButton.png\"</img></a><br />"); + out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\"/file-access/default/members/jbosswiki/images/historyButton.png\" /></a><br />"); } %> <input type="text" name="searchQuery" /> Modified: qa/forge/portal-extensions/jspwiki/maven.xml =================================================================== --- qa/forge/portal-extensions/jspwiki/maven.xml 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/jspwiki/maven.xml 2005-08-26 17:03:45 UTC (rev 977) @@ -5,20 +5,20 @@ --> <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> <goal name="build"> - <ant:ant dir="${basedir}" antfile="build.xml" target="war" /> + <!--<ant:ant dir="${basedir}" antfile="build.xml" target="war" />--> </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="releases/*.war" /> </ant:fileset> - </ant:copy> + </ant:copy>--> </goal> <goal name="prj-install"> - <ant:copy todir="${local.deploy.dir}/../.." overwrite="no"> + <!--<ant:copy todir="${local.deploy.dir}/../.." overwrite="no"> <ant:fileset dir="to-copy" /> - </ant:copy> + </ant:copy>--> </goal> </project> Modified: qa/forge/portal-extensions/maven.xml =================================================================== --- qa/forge/portal-extensions/maven.xml 2005-08-26 16:37:10 UTC (rev 976) +++ qa/forge/portal-extensions/maven.xml 2005-08-26 17:03:45 UTC (rev 977) @@ -116,7 +116,6 @@ 3. blojsom/to-copy/blojsom.war/WEB-INF/blojsom.properties 4. forge-login/to-copy/portal-login-ds.xml 5. federation-register/src/web/WEB-INF/faces-config (only for the JOSF portal). -6. forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample (change htmlTranslatorURL to your url) Available goals: - help - prints this info |
Author: dam...@jb... Date: 2005-08-26 12:37:10 -0400 (Fri, 26 Aug 2005) New Revision: 976 Added: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/ qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/antlr-2.7.5H3.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm-attrs.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/cglib-2.1.1.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-beanutils.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-codec-1.2.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-collections.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-digester-1.6.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-discovery.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-fileupload.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-httpclient.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-lang-1.0.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-logging.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-pool.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/dom4j.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jaxen-1.1-beta-4.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/ qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/ qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/MANIFEST.MF qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/base-aop.xml qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/javassist.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/trove.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/jboss-xb.jar Removed: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/ qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/antlr-2.7.5H3.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm-attrs.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/cglib-2.1.1.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-beanutils.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-codec-1.2.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-collections.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-digester-1.6.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-discovery.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-fileupload.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-httpclient.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-lang-1.0.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-logging.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-pool.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/dom4j.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jaxen-1.1-beta-4.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/ qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/MANIFEST.MF qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/base-aop.xml qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/javassist.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/trove.jar qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop.deployer/ Log: MERGED: -r 962:964 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. This adds EJB3 and the correct deployer. Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF) Deleted: qa/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-25 19:23:17 UTC (rev 964) +++ qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml 2005-08-26 16:37:10 UTC (rev 976) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<server> - <mbean code="org.jboss.ejb3.EJB3Deployer" name="jboss.ejb3:service=EJB3Deployer"> - <depends>jboss.aop:service=AspectDeployer</depends> - </mbean> - - <mbean code="org.jboss.remoting.transport.Connector" - xmbean-dd="org/jboss/remoting/transport/Connector.xml" - name="jboss.remoting:type=Connector,transport=socket3873,handler=ejb3"> - <depends>jboss.aop:service=AspectDeployer</depends> - <attribute name="InvokerLocator">socket://0.0.0.0:3873</attribute> - <attribute name="Configuration"> - <handlers> - <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler> - </handlers> - </attribute> - </mbean> - -</server> Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml) Deleted: qa/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-25 19:23:17 UTC (rev 964) +++ qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties 2005-08-26 16:37:10 UTC (rev 976) @@ -1,15 +0,0 @@ -hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup -hibernate.connection.release_mode=after_statement -hibernate.transaction.flush_before_completion=false -hibernate.transaction.auto_close_session=false -hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory -hibernate.hbm2ddl.auto=create-drop -#hibernate.hbm2ddl.auto=create -hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider -# Clustered cache with TreeCache -#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook -#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache -hibernate.connection.datasource=java:/DefaultDS -hibernate.dialect=org.hibernate.dialect.HSQLDialect -hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/antlr-2.7.5H3.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/antlr-2.7.5H3.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/antlr-2.7.5H3.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm-attrs.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm-attrs.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm-attrs.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/cglib-2.1.1.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/cglib-2.1.1.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/cglib-2.1.1.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-beanutils.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-beanutils.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-beanutils.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-codec-1.2.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-codec-1.2.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-codec-1.2.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-collections.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-collections.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-collections.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-digester-1.6.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-digester-1.6.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-digester-1.6.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-discovery.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-discovery.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-discovery.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-fileupload.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-fileupload.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-fileupload.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-httpclient.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-httpclient.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-httpclient.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-lang-1.0.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-lang-1.0.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-lang-1.0.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-logging.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-logging.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-logging.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-pool.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-pool.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-pool.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/dom4j.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/dom4j.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/dom4j.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jaxen-1.1-beta-4.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jaxen-1.1-beta-4.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jaxen-1.1-beta-4.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/MANIFEST.MF =================================================================== --- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/MANIFEST.MF 2005-08-25 19:23:17 UTC (rev 964) +++ qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/MANIFEST.MF 2005-08-26 16:37:10 UTC (rev 976) @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.6.2 -Created-By: 1.5.0_03-b07 (Sun Microsystems Inc.) -Specification-Title: JBoss AOP Aspect Library -Specification-Version: jboss-aspect-library-1.3 -Specification-Vendor: JBoss (http://www.jboss.org/) -Implementation-Title: JBoss AOP Aspect Library -Implementation-URL: http://www.jboss.org/ -Implementation-Version: jboss-aspect-library-1.3 -Implementation-Vendor: JBoss.org -Implementation-Vendor-Id: http://www.jboss.org/ - Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/MANIFEST.MF (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/MANIFEST.MF) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml =================================================================== --- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml 2005-08-25 19:23:17 UTC (rev 964) +++ qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml 2005-08-26 16:37:10 UTC (rev 976) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- $Id: jboss-service.xml,v 1.3.2.3 2005/06/19 07:08:07 bill Exp $ --> - -<!-- ===================================================================== --> -<!-- JBoss Server Configuration --> -<!-- ===================================================================== --> - -<server> - - <mbean code="org.jboss.aop.deployment.AspectManagerService" - name="jboss.aop:service=AspectManager"> - <attribute name="EnableLoadtimeWeaving">false</attribute> - <!-- only relevant when EnableLoadtimeWeaving is true. - When transformer is on, every loaded class gets - transformed. If AOP can't find the class, then it - throws an exception. Sometimes, classes may not have - all the classes they reference. So, the Suppressing - is needed. (i.e. Jboss cache in the default configuration --> - <attribute name="SuppressTransformationErrors">true</attribute> - <attribute name="Prune">true</attribute> - <attribute name="Include">org.jboss.test</attribute> - <attribute name="Exclude">org.jboss.</attribute> - <attribute name="Optimized">true</attribute> - <attribute name="Verbose">false</attribute> - </mbean> - - <mbean code="org.jboss.aop.deployment.AspectDeployer" - name="jboss.aop:service=AspectDeployer"> - </mbean> - -</server> Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/base-aop.xml =================================================================== --- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/base-aop.xml 2005-08-25 19:23:17 UTC (rev 964) +++ qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/base-aop.xml 2005-08-26 16:37:10 UTC (rev 976) @@ -1,133 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE aop PUBLIC - "-//JBoss//DTD JBOSS AOP 1.0//EN" - "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd"> - -<aop> - <!-- custom configuration for AOP Security --> - <metadata-loader tag="security" class="org.jboss.aspects.security.SecurityClassMetaDataLoader"/> - - <stack name="J2EESecurityStack"> - <interceptor factory="org.jboss.aspects.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/> - <interceptor factory="org.jboss.aspects.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/> - <interceptor class="org.jboss.aspects.security.RunAsSecurityInterceptor"/> - </stack> - - <bind pointcut="all(@security)"> - <stack-ref name="J2EESecurityStack"/> - </bind> - - <bind pointcut="all(@org.jboss.aspects.security.Permissions)"> - <stack-ref name="J2EESecurityStack"/> - </bind> - - <bind pointcut="all(@org.jboss.aspects.security.Unchecked)"> - <stack-ref name="J2EESecurityStack"/> - </bind> - - <bind pointcut="all(@org.jboss.aspects.security.Exclude)"> - <stack-ref name="J2EESecurityStack"/> - </bind> - - <introduction expr="class(@org.jboss.aspects.jmx.MBean)"> - <mixin> - <interfaces>javax.management.DynamicMBean</interfaces> - <class>org.jboss.aspects.jmx.JmxIntrospectingMixin</class> - <construction>new org.jboss.aspects.jmx.JmxIntrospectingMixin(this)</construction> - </mixin> - </introduction> - - <!-- asynchronous aspect --> - <aspect class="org.jboss.aspects.asynch.AsynchAspect" scope="PER_INSTANCE"> - <advisor-attribute name="Advisor"/> - </aspect> - - <bind pointcut="execution(!static * *->@org.jboss.aspects.asynch.Asynchronous(..))"> - <advice name="execute" aspect="org.jboss.aspects.asynch.AsynchAspect"/> - </bind> - - <introduction expr="has(!static * *->@org.jboss.aspects.asynch.Asynchronous(..))"> - <mixin> - <interfaces>org.jboss.aspects.asynch.AsynchProvider,org.jboss.aspects.asynch.FutureHolder</interfaces> - <class>org.jboss.aspects.asynch.AsynchMixin</class> - </mixin> - </introduction> - - <!-- old asynch aspect from Claude --> - - <aspect class="org.jboss.aspects.asynchronous.aspects.jboss.AsynchronousAspect" scope="PER_VM"/> - - <bind pointcut="execution(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..))"> - <advice name="execute" aspect="org.jboss.aspects.asynchronous.aspects.jboss.AsynchronousAspect"/> - </bind> - - <introduction expr="has(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..)) OR class(@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous)"> - - <mixin> - <interfaces> - org.jboss.aspects.asynchronous.aspects.AsynchronousFacade - </interfaces> - <class>org.jboss.aspects.asynchronous.aspects.AsynchronousFacadeImpl</class> - <construction>new org.jboss.aspects.asynchronous.aspects.AsynchronousFacadeImpl()</construction> - </mixin> - </introduction> - - <!-- TRANSACTIONS --> - <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/> - <interceptor factory="org.jboss.aspects.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/> - - <bind pointcut="all(@transaction)"> - <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/> - </bind> - - <interceptor name="class-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory" scope="PER_CLASS"/> - <interceptor name="instance-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory" scope="PER_INSTANCE"/> - - <bind pointcut="execution(static * *->@TxSynchronized(..)) OR execution(*->@TxSynchronized(..))"> - <interceptor-ref name="class-txsynchronized"/> - </bind> - - <bind pointcut="execution(!static * *->@TxSynchronized(..))"> - <interceptor-ref name="instance-txsynchronized"/> - </bind> - - <bind pointcut="all(@org.jboss.aspects.tx.Tx)"> - <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/> - </bind> - - <bind pointcut="execution(static * *->@org.jboss.aspects.txlock.TxSynchronized(..)) OR execution(*->@org.jboss.aspects.txlock.TxSynchronized(..))"> - <interceptor-ref name="class-txsynchronized"/> - </bind> - - <bind pointcut="execution(!static * *->@org.jboss.aspects.txlock.TxSynchronized(..))"> - <interceptor-ref name="instance-txsynchronized"/> - </bind> - - <!-- injection --> - <aspect class="org.jboss.aspects.tx.TransactionInjector"/> - <aspect class="org.jboss.aspects.tx.TransactionManagerInjector"/> - - <bind pointcut="field(javax.transaction.Transaction *->@org.jboss.aspects.Current)"> - <advice name="access" aspect="org.jboss.aspects.tx.TransactionInjector"/> - </bind> - - <bind pointcut="field(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)"> - <advice name="access" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/> - </bind> - - <bind pointcut="execution(*->new(..)) AND hasfield(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)"> - <advice name="allocation" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/> - </bind> - - <!-- special types --> - <aspect class="org.jboss.aspects.ThreadbasedAspect" scope="PER_JOINPOINT"/> - <bind pointcut="field(* *->@org.jboss.aspects.Threadbased)"> - <advice name="access" aspect="org.jboss.aspects.ThreadbasedAspect"/> - </bind> - - <aspect class="org.jboss.aspects.tx.TransactionLocalAspect" scope="PER_JOINPOINT"/> - <bind pointcut="field(* *->@org.jboss.aspects.tx.TxLocal)"> - <advice name="access" aspect="org.jboss.aspects.tx.TransactionLocalAspect"/> - </bind> - -</aop> Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/base-aop.xml (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/base-aop.xml) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/javassist.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/javassist.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/javassist.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar) Deleted: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/trove.jar =================================================================== (Binary files differ) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/trove.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/trove.jar) Copied: qa/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/jboss-xb.jar (from rev 964, trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/jboss-xb.jar) |
|
From: <jbo...@li...> - 2005-08-26 16:19:22
|
Author: ral...@jb...
Date: 2005-08-26 12:19:19 -0400 (Fri, 26 Aug 2005)
New Revision: 975
Modified:
trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css
Log:
<code> removed
Modified: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css
===================================================================
--- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css 2005-08-26 16:06:00 UTC (rev 974)
+++ trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css 2005-08-26 16:19:19 UTC (rev 975)
@@ -16,8 +16,8 @@
p { line-height: 150%; }
pre { font-family: Andale Mono, Courier New, Courier, monospace; }
-code { font: 11px Andale Mono, Courier New, Courier, monospace; line-height: 80%; white-space: pre; padding: 5px; margin: 5px; background-color: #efefef; width: 550px; overflow: visible; }
+
hr { color: #6e6e6e; }
|
|
From: <jbo...@li...> - 2005-08-26 15:46:22
|
Author: dam...@jb... Date: 2005-08-26 11:46:09 -0400 (Fri, 26 Aug 2005) New Revision: 973 Added: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiSearch.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FindResultPlugin.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java Removed: qa/forge/portal-extensions/jboss-as-binaries/to-copy/ Modified: qa/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp Log: MERGED: -r 952:961 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. This removes the old AS in preparation for the addition of a new version. Modified: qa/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java =================================================================== --- qa/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java 2005-08-26 14:20:57 UTC (rev 972) +++ qa/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java 2005-08-26 15:46:09 UTC (rev 973) @@ -44,17 +44,19 @@ static String getBaseServerAddress() { int port; String server; + String scheme; Object request = getExternalContext().getRequest(); if (request instanceof JBossActionRequest) { + scheme = ((JBossActionRequest) request).getScheme(); port = ((JBossActionRequest) request).getServerPort(); server = ((JBossActionRequest) request).getServerName(); } else if (request instanceof JBossRenderRequest) { + scheme = ((JBossRenderRequest) request).getScheme(); port = ((JBossRenderRequest) request).getServerPort(); server = ((JBossRenderRequest) request).getServerName(); } else return ""; - return (((port == 80) || (port == 8080)) ? "http" : "https") + - "://" + server + ":" + port; + return scheme + "://" + server + ":" + port; } static String getPortalName() { Modified: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-26 14:20:57 UTC (rev 972) +++ qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-26 15:46:09 UTC (rev 973) @@ -24,6 +24,10 @@ <name>friendlyLinks</name> <class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class> </plugin> + <plugin> + <name>secureLinks</name> + <class>org.jboss.wiki.plugins.SecureLinksPlugin</class> + </plugin> </wikiType> <wikiType> <name>DIFF</name> @@ -33,4 +37,16 @@ <class>org.jboss.wiki.plugins.DiffPlugin</class> </plugin> </wikiType> + <wikiType> + <name>FIND</name> + <class>org.jboss.wiki.plugins.DefaultWikiType</class> + <plugin> + <name>findResult</name> + <class>org.jboss.wiki.plugins.FindResultPlugin</class> + </plugin> + <plugin> + <name>wikiToHtmlTranslator</name> + <class>org.jboss.wiki.plugins.HTMLTranslator</class> + </plugin> + </wikiType> </wikiTypes> \ No newline at end of file Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java 2005-08-26 14:20:57 UTC (rev 972) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java 2005-08-26 15:46:09 UTC (rev 973) @@ -31,6 +31,8 @@ * </p> * */ + private final String SAVE_COMMENT = "Saved by FileDataSource of JBoss Wiki"; + 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; @@ -63,8 +65,7 @@ pathToMedia = fileDSProps.getProperty("pathToMedia"); System.out.println("Path to media is: " + pathToMedia); pathToAttachments = fileDSProps.getProperty("pathToAttachements"); - System.out - .println("Path to attachements is: " + pathToAttachments); + System.out.println("Path to attachements is: " + pathToAttachments); } else { System.err .println("Your properties file lacks of pathToMedia property. It will not run properly ! Please update " @@ -161,8 +162,7 @@ properties.setProperty(page.getLastVersion() + ".author", page .getLastAuthor().getName()); - properties.store(pageWriter, - "Saved by FileDataSource of JBoss Wiki"); + properties.store(pageWriter, SAVE_COMMENT); pageWriter.close(); @@ -200,13 +200,39 @@ Properties pageProps = new Properties(); try { - pageProps.load(new FileInputStream(new File(pathToMedia + "/OLD/" - + pageName + "/page.properties"))); + FileInputStream fpi = new FileInputStream(new File(pathToMedia + + "/OLD/" + pageName + "/page.properties")); + pageProps.load(fpi); + fpi.close(); } catch (IOException ioe) { - System.err.println("Cannot read page.properties for page: " - + pageName + " file: " + pathToMedia + "/OLD/" + pageName - + "/page.properties\n" + ioe); - return null; + // There is no prop file for some reson - create one. + + File pagePropsFile = new File(pathToMedia + "/OLD/" + pageName); + + // create dirs + pagePropsFile.mkdirs(); + + // create file + pagePropsFile = new File(pathToMedia + "/OLD/" + pageName + + "/page.properties"); + + try { + pagePropsFile.createNewFile(); + + if (pageExists(pageName)) { + // if page exists it looks like there is lack of the props structure + FileOutputStream fpo = new FileOutputStream(pagePropsFile); + + pageProps.setProperty("1.author", "unknown"); + pageProps.store(fpo, SAVE_COMMENT); + fpo.close(); + } + + } catch (IOException e) { + System.err.println("Cannot create page props file for page: " + + pageName); + } + return pageProps; } return pageProps; @@ -222,7 +248,7 @@ // create dirs for this property file propFile.mkdirs(); } - + propFile = new File(pathToAttachments + "/" + pageName + "-att/" + attName + "-dir/attachment.properties"); @@ -245,8 +271,7 @@ try { props.store(new FileOutputStream(new File(pathToAttachments + "/" + pageName + "-att/" + attName - + "-dir/attachment.properties")), - "Saved by FileDataSource of JBoss Wiki"); + + "-dir/attachment.properties")), SAVE_COMMENT); } catch (Exception ioe) { System.err .println("Cannot store attchement.properties for attachement: " @@ -260,8 +285,8 @@ } public WikiPage getPage(String pageName) { - System.out.println("[WIKI:FileDataSource]: Getting new page: " - + pageName); + // System.out.println("[WIKI:FileDataSource]: Getting new page: " + + // pageName); WikiPage page = null; @@ -283,7 +308,7 @@ Credentials author = new Credentials(pageProps .getProperty(String.valueOf(i) + ".author")); - String pageContent = ""; + StringBuilder pageContent = new StringBuilder(); try { FileInputStream input = new FileInputStream(pageFile); @@ -291,15 +316,15 @@ int nextChr = input.read(); while (nextChr != -1) { - pageContent += (char) nextChr; + pageContent.append((char) nextChr); nextChr = input.read(); } } catch (IOException ioe) { System.err.println(ioe); } - page = new WikiPage(pageName, author, pageContent, i, i, - new Date(pageFile.lastModified()), this); + page = new WikiPage(pageName, author, pageContent.toString(), + i, i, new Date(pageFile.lastModified()), this); page.setLength(pageFile.length()); } @@ -319,15 +344,9 @@ 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(WikiPage originPage, boolean loadContent, String languageCode, int version) { if (languageCode != null) { @@ -382,7 +401,7 @@ public void getContentAtVersion(WikiPage page, boolean loadContent, int version) { - String ret = null; + StringBuilder ret = null; File pageFile = new File(pathToMedia + "/OLD/" + page.getName() + "/" + version + ".txt"); @@ -393,14 +412,14 @@ int nextChr = input.read(); - ret = ""; + ret = new StringBuilder(); while (nextChr != -1) { - ret += (char) nextChr; + ret.append((char) nextChr); nextChr = input.read(); } - page.setPageContent(ret); + page.setPageContent(ret.toString()); page.setLength(ret.length()); } catch (IOException ioe) { @@ -439,7 +458,8 @@ } } - public void addAtachement(File attFile, String attName, WikiPage page, String user) { + public void addAtachement(File attFile, String attName, WikiPage page, + String user) { String pageName = page.getName(); Properties attProps = getAttProps(pageName, attName); @@ -491,36 +511,57 @@ System.err.println(e); } } - + // at the end delete the temp file attFile.delete(); - + attProps.setProperty(lastVersion + ".author", user); - + saveAttProps(attProps, pageName, attName); } public Set<String> getAttachementsSet(WikiPage page) { Set<String> attSet = new HashSet<String>(); - - File attDir = new File(pathToAttachments+"/"+page.getName()+"-att"); - + + File attDir = new File(pathToAttachments + "/" + page.getName() + + "-att"); + if (attDir.exists()) { File[] attachements = attDir.listFiles(); - + for (int i = 0; i < attachements.length; i++) { - if ((attachements[i].isDirectory())&&(attachements[i].getName().endsWith("-dir"))) { + if ((attachements[i].isDirectory()) + && (attachements[i].getName().endsWith("-dir"))) { String[] tokens = attachements[i].getName().split("/"); - attSet.add(tokens[tokens.length - 1].substring(0, tokens[tokens.length - 1].length()-4)); + attSet.add(tokens[tokens.length - 1].substring(0, + tokens[tokens.length - 1].length() - 4)); } } - } - else { + } else { // page has no attachements return null; } - + return attSet; } + public Set<String> getAllPageNames() { + Set<String> attSet = new HashSet<String>(); + + File attDir = new File(pathToMedia + "/"); + + File[] pageFiles = attDir.listFiles(); + + for (int i = 0; i < pageFiles.length; i++) { + if ((pageFiles[i].isFile()) + && (pageFiles[i].getName().endsWith(".txt"))) { + String[] tokens = pageFiles[i].getName().split("/"); + attSet.add(tokens[tokens.length - 1].substring(0, + tokens[tokens.length - 1].length() - 4)); + } + } + + return attSet; + } + } Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java 2005-08-26 14:20:57 UTC (rev 972) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java 2005-08-26 15:46:09 UTC (rev 973) @@ -23,18 +23,11 @@ * @return */ public boolean preSave(); + /** * <p>Does ...</p> * * - * @return - * @param media - */ - public boolean save(Media media); -/** - * <p>Does ...</p> - * - * * @param page * @return * @param languageCode @@ -92,6 +85,8 @@ public void addAtachement(File attFile, String attName, WikiPage page, String user); public Set<String> getAttachementsSet(WikiPage page); + + public Set<String> getAllPageNames(); } Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-26 14:20:57 UTC (rev 972) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-26 15:46:09 UTC (rev 973) @@ -10,10 +10,12 @@ import java.util.Date; import java.util.HashMap; +import java.util.Set; +import java.util.TreeSet; + import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; - /** * * @author <a href="mailto:ds...@jb...">Damon Sicore</a> @@ -39,6 +41,8 @@ private MediaDataSource mediaDataSource; + WikiPage noSuchPage; + /** * <p> * Does ... @@ -69,9 +73,9 @@ // your code here return false; } - + public boolean pageExists(String pageName) { - + return mediaDataSource.pageExists(pageName); } @@ -101,7 +105,7 @@ * @param wikiContext */ public WikiPage getByName(String pageName, WikiContext wikiContext) { - + WikiPage ret = null; if (pages.containsKey(pageName)) { @@ -119,14 +123,26 @@ return ret; } } else { - return null; + try { + ret = (WikiPage) noSuchPage.clone(); + ret.setName(pageName); + } catch (CloneNotSupportedException cne) { + System.err.println(cne); + + } + if (wikiContext != null) { + return wikiContext.process(ret); + } else { + return ret; + } } } - - public WikiPage getByName(String pageName, WikiContext wikiContext, int version) { - + + public WikiPage getByName(String pageName, WikiContext wikiContext, + int version) { + WikiPage ret = null; - + if (pages.containsKey(pageName)) { ret = pages.get(pageName); } else { @@ -134,9 +150,9 @@ pages.put(pageName, ret); } - + ret = ret.getPageAtVersion(true, version); - + if (ret != null) { if (wikiContext != null) { return wikiContext.process(ret); @@ -144,6 +160,18 @@ return ret; } } else { + // return noSuchPage if there isn't any + /*try { + ret = (WikiPage) noSuchPage.clone(); + } catch (CloneNotSupportedException cne) { + System.err.println(cne); + + } + if (wikiContext != null) { + return wikiContext.process(ret); + } else { + return ret; + }*/ return null; } } @@ -161,6 +189,10 @@ pages = new HashMap<String, WikiPage>(); wikiTypes = new HashMap<String, WikiType>(); + noSuchPage = new WikiPage("", new Credentials(""), + "There is no such page. Click on EDIT to start it.", 0, 0, + null, mediaDataSource); + loadWikiTypes(); } @@ -175,7 +207,7 @@ protected void loadWikiTypes() { try { wikiTypes.clear(); - + SAXParser sp = (SAXParserFactory.newInstance()).newSAXParser(); sp.parse( WikiTypeHandler.class.getResourceAsStream("WikiTypes.xml"), @@ -300,11 +332,32 @@ System.out.println(wp.getContent()); } - + public void refreshPage(String pageName) { if (pages.containsKey(pageName)) { pages.remove(pageName); } } + public Set<String> findPages(String searchQuery) { + System.out.println("Starting search: " + searchQuery); + WikiSearch wikiSearch = new WikiSearch(searchQuery); + + Set<String> resPages = new TreeSet<String>(); + + Set<String> pages = getMediaDataSource().getAllPageNames(); + + for (String name : pages) { + WikiPage temp = getByName(name, null); + if (temp != null) { + if (wikiSearch.matches(temp.getPageContent().toLowerCase())) { + resPages.add(name); + } + } + } + + System.out.println("Search completed"); + return resPages; + } + } Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-26 14:20:57 UTC (rev 972) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-26 15:46:09 UTC (rev 973) @@ -14,6 +14,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; +import java.util.Set; import javax.portlet.*; import org.jboss.portlet.*; @@ -111,6 +112,21 @@ } } + if (rReq.getParameter("page") != null) { + rResp.setRenderParameter("page", rReq.getParameter("page")); + + } + + if (rReq.getParameter("searchQuery") != null) { + //TODO do it man ! + Set<String> pages = wikiEngine.findPages(rReq.getParameter("searchQuery")); + + rReq.getPortletSession().setAttribute("findResult", pages); + + // show the results + rResp.setRenderParameter("page", "FindResult"); + } + if (rReq.getParameter("action") != null) { rResp.setRenderParameter("action", rReq.getParameter("action")); } @@ -126,11 +142,6 @@ rResp.setRenderParameter("version", rReq.getParameter("version")); } - if (rReq.getParameter("page") != null) { - rResp.setRenderParameter("page", rReq.getParameter("page")); - - } - if (rReq.getParameter("editAction") != null) { System.out.println("EDITING PAGE"); @@ -185,6 +196,7 @@ public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes) throws PortletException, java.io.IOException { + rReq.getPortletSession().setAttribute("isSecure", new Boolean(rReq.isSecure())); WikiPage noSuchPage = new WikiPage("", new Credentials(""), "There is no such page. Click on EDIT to start it.", 0, 0, @@ -318,7 +330,7 @@ PortletURL wikiURL = rRes.createActionURL(); rReq.setAttribute("actionURL", wikiURL.toString()); - + rReq .setAttribute( "wikiName", @@ -341,8 +353,14 @@ // pass friendly link Properties props = new Properties(); props.load(WikiPlugin.class.getResourceAsStream("wikiPlugins.properties")); - rReq.setAttribute("firendlyLink", props.getProperty("htmlTranslatorURL")+"wiki/"+pageToShow.getName()); + String href = props.getProperty("htmlTranslatorURL")+"wiki/"+pageToShow.getName(); + if (rReq.isSecure()) { + //change http to https + href = href.replaceFirst("http", "https"); + } + + rReq.setAttribute("friendlyLink", href); rRes.setTitle("Wiki"); if (javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState()) Copied: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiSearch.java (from rev 961, trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiSearch.java) Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-26 14:20:57 UTC (rev 972) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-26 15:46:09 UTC (rev 973) @@ -86,6 +86,7 @@ System.out.println("cannot clone the page: " + cnse); } + // execute the plugins for (int i = 0; i < plugins.size(); i++) { System.out.println("Executing plugin: "+plugins.get(i).getName()); newPage = (plugins.get(i)).process(newPage, wikiSession); Copied: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FindResultPlugin.java (from rev 961, trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FindResultPlugin.java) Copied: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java (from rev 961, trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java) Modified: qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-26 14:20:57 UTC (rev 972) +++ qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-26 15:46:09 UTC (rev 973) @@ -12,7 +12,8 @@ String wikiContent = (String)request.getAttribute("wikiContent"); String wikiPage = (String)request.getAttribute("wikiPage"); String defaultPage = (String)request.getAttribute("defaultPage"); - String firendlyLink = (String)request.getAttribute("firendlyLink"); + String friendlyLink = (String)request.getAttribute("friendlyLink"); + String type = (String)request.getParameter("type"); java.util.Date editDate = (java.util.Date)request.getAttribute("editDate"); org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author"); %> @@ -21,11 +22,11 @@ <!--<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a><br />--> -<form method="post" action="<%=actionURL%>"> +<form method="post" action="<%=actionURL%>&type=FIND"> <table style="width: 100%" border="0"> <tr style="vertical-align: bottom;"> <td style="vertical-align: bottom; align-bottom: 0px;"> -<div><a href="<%=firendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" /></a> <a href="<%=firendlyLink%>"><%=firendlyLink%></a></div> +<div><a href="<%=friendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" /></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div> </td> <td style="text-align: right;vertical-align: bottom; align-bottom: 0px;"> @@ -34,20 +35,26 @@ String logedIn = (String)request.getAttribute("logedIn"); - if (logedIn.equals("true")) { - out.print("<a href='"+actionURL+"&action=Edit&page="+wikiPage+"'><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\"</img></a>\n"+ - "<a href=\""+actionURL+"&action=Attach\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\"</img></a>"); - + if ((type == null)||(type.equals("HTML"))) { + if (logedIn.equals("true")) { + out.print("<a href='"+actionURL+"&action=Edit&page="+wikiPage+"'><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\"</img></a>\n"+ + "<a href=\""+actionURL+"&action=Attach\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\"</img></a>"); + + } + else { + out.print("<div style='font-size: xx-small'><i>Login to edit pages and attach files</i></div>"); + } } - else { - out.print("<div style='font-size: xx-small'><i>Login to edit pages and attach files</i></div>"); - } %> - <a href="<%=actionURL%>&action=Info&page=<%=wikiPage%>"><img alt="HISTORY" src="/file-access/default/members/jbosswiki/images/historyButton.png"</img></a><br /> -<input type="text" name="page" /> -<input type="submit" value="GO" /> +<% +if ((type == null)||(type.equals("HTML"))) { + out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\"/file-access/default/members/jbosswiki/images/historyButton.png\"</img></a><br />"); + } + %> +<input type="text" name="searchQuery" /> +<input type="submit" value="SEARCH" /> </td> </tr> </table> @@ -86,9 +93,9 @@ } %> -<table style="width: 100%"> -<tr> -<td class="wikiContent"><%=wikiContent%><td> +<table style="width: 100%; margin: 0px; padding: 0px;"> +<tr style="width: 100%; margin: 0px; padding: 0px;"> +<td style="width: 100%; margin: 0px; padding: 0px;"><%=wikiContent%><td> </tr> <tr> <td class="wikiFooter"> @@ -101,5 +108,10 @@ </tr> </table> <br /> -<div class="author">The page last changed on <%=editDate%> by <%=author%>. </div> +<% +if ((type == null)||(type.equals("HTML"))) { + out.println("<div>The page last changed on "+editDate+" by "+author+". </div>"); +} +%> + |
|
From: <jbo...@li...> - 2005-08-26 14:21:08
|
Author: ral...@jb...
Date: 2005-08-26 10:20:57 -0400 (Fri, 26 Aug 2005)
New Revision: 972
Modified:
trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
Log:
freezone handles folders
Modified: trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 13:37:25 UTC (rev 971)
+++ trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-08-26 14:20:57 UTC (rev 972)
@@ -56,17 +56,7 @@
h = content.indexOf(" href="); //search for one of the link types
if (h == -1)
{
-// ch = content.indexOf("HREF=");//search for the capitalized version as well
-// if(ch == -1)
- return null;
-// else
-// {
-// start = ch; //found the capitalized version
-// content= content.substring(0, ch) +
-// content.substring(ch, ch+4).toLowerCase() +
-// content.substring(ch+4); //need to make it lower case for
-// //later parsing
-// }
+ return null;
}
else start = h;
int begin = content.substring(start).indexOf('"');
@@ -101,7 +91,59 @@
|| link.startsWith("https:") || link.startsWith("mailto:")
|| link.startsWith("news:") || link.startsWith("file:");
}
+
+// modifies path to page/resource so folder structure can be supported
+ private String modifyPath(String path, String element) {
+ System.out.println("element is: "+ element);
+ System.out.println("path is: "+ path);
+ int start, end;
+ String mainPath = "";
+
+ int pre = path.lastIndexOf('/');
+ if(pre== -1)//we are in root dir
+ {
+ return element;
+ }
+ else {
+ mainPath = path.substring(0, pre);
+ System.out.println("main path is: " + mainPath);
+ }//main path to page
+
+
+ if (element.startsWith("/"))
+ return element.substring(1); //base path, start with WEB-root
+ if (element.startsWith("./"))
+ element = element.substring(1);//ignore ./ only clutters the code
+ if (element.indexOf('/') != -1) {
+ if (element.indexOf("../") != -1)//need to go up a few levels
+ {
+ while (element.indexOf("../") != -1) //do we need to go more
+ {
+ if (mainPath.equals(""))
+ return DEFAULT_PAGE; //trying to go too far up
+ else {
+ start = element.lastIndexOf("../");//go one level up
+ end = mainPath.lastIndexOf("/");//find last level
+ element = element.substring(0, start)
+ //+ mainPath
+ // .substring(end, mainPath.length())
+ + element
+ .substring(start + 3, element.length());
+ // System.out.println("element is: " + element);
+ mainPath = mainPath.substring(0, end);
+ // System.out.println("mainPath is: " + mainPath);
+ }//else
+
+ }//while
+
+ }//if ../
+
+ }
+
+ return mainPath + '/' + element;
+ }
+
public void doView(JBossRenderRequest request, JBossRenderResponse response)
throws IOException {
response.setContentType("text/html");
@@ -134,6 +176,7 @@
throw new Exception();
String nextRef;
+ String nextRef2;
while(pageContent.indexOf("HREF=")!= -1)
{
pageContent = forgeHelper.replace(pageContent,"HREF=", "href=");
@@ -142,11 +185,14 @@
// Replacing links
while ((nextRef = findNextReference(pageContent, "link")) != null) {
if(!isExternalLink(nextRef))
+ {
//it would be relative not outside link
+ nextRef2 = modifyPath(pagePath, nextRef);
pageContent = forgeHelper.replace(pageContent, "href="
+ '"' + nextRef + '"',
projectsHelper.createFreezonePageLink(portalName,
- projectId, nextRef) + '"');
+ projectId, nextRef2) + '"');
+ }
else {
pageContent = forgeHelper.replace(pageContent, "href="
+ '"' + nextRef, "$"+nextRef+'"');
|
|
From: <jbo...@li...> - 2005-08-26 13:37:30
|
Author: szimano Date: 2005-08-26 09:37:25 -0400 (Fri, 26 Aug 2005) New Revision: 971 Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp Log: logo separated from page name with : 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-26 12:45:47 UTC (rev 970) +++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-26 13:37:25 UTC (rev 971) @@ -21,10 +21,10 @@ <table style="width: 100%" border="0"> <tr> <td style="font-size: large"> -<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a> <%=wikiPage%> +<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a> : <%=wikiPage%> </td> <td style="text-align: right;"> -[<a href="<%=actionURL%>&page=<%=defaultPage%>">MAIN</a>] +[<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a>] </td> </table> |
|
From: <jbo...@li...> - 2005-08-26 12:45:56
|
Author: szimano
Date: 2005-08-26 08:45:47 -0400 (Fri, 26 Aug 2005)
New Revision: 970
Modified:
trunk/forge/portal-extensions/forge-wiki/project.xml
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:
Tests back on, added MAIN link over the buttons
Modified: trunk/forge/portal-extensions/forge-wiki/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-26 10:58:17 UTC (rev 969)
+++ trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-26 12:45:47 UTC (rev 970)
@@ -10,15 +10,30 @@
<id>wiki</id>
<name>Wiki portlet</name>
<currentVersion>1.0</currentVersion>
- <!--<build>
- <unitTestSourceDirectory>./src/test/java</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- <include>**/Test*.java</include>
- </includes>
- </unitTest>
- </build>-->
+ <build>
+ <unitTestSourceDirectory>./src/test/java</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/Test*.java</include>
+ </includes>
+ </unitTest>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*.properties</include>
+ </resource>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*.xml</include>
+ </resource>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*.types</include>
+ </resource>
+ </resources>
+ </build>
<organization>
<name>Tomasz Szymanski</name>
<url>http://mamut.net.pl</url>
@@ -69,22 +84,4 @@
</dependency>
</dependencies>
-
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <resources>
- <resource>
- <directory>src/etc/</directory>
- <include>**/*.properties</include>
- </resource>
- <resource>
- <directory>src/etc/</directory>
- <include>**/*.xml</include>
- </resource>
- <resource>
- <directory>src/etc/</directory>
- <include>**/*.types</include>
- </resource>
- </resources>
- </build>
</project>
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-26 10:58:17 UTC (rev 969)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-26 12:45:47 UTC (rev 970)
@@ -342,7 +342,7 @@
rReq
.setAttribute(
"wikiName",
- "<img src=\"/file-access/default/members/jbosswiki/images/JBossWikiLogoMedium.png\" width=\"100\" border=\"0\" />");
+ "<img src=\"/file-access/default/members/jbosswiki/images/JBossWikiLogoMedium.png\" width=\"100\" border=\"0\" style=\"vertical-align: middle\"/>");
rReq.setAttribute("wikiContent", pageToShow.getContent());
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-26 10:58:17 UTC (rev 969)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-26 12:45:47 UTC (rev 970)
@@ -18,7 +18,15 @@
org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author");
%>
-<h2><a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a>/ <%=wikiPage%> </h2>
+<table style="width: 100%" border="0">
+<tr>
+<td style="font-size: large">
+<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a> <%=wikiPage%>
+</td>
+<td style="text-align: right;">
+[<a href="<%=actionURL%>&page=<%=defaultPage%>">MAIN</a>]
+</td>
+</table>
<!--<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a><br />-->
|
|
From: <jbo...@li...> - 2005-08-26 10:58:22
|
Author: szimano
Date: 2005-08-26 06:58:17 -0400 (Fri, 26 Aug 2005)
New Revision: 969
Modified:
trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties
trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
upload bug
Modified: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties 2005-08-26 10:52:10 UTC (rev 968)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties 2005-08-26 10:58:17 UTC (rev 969)
@@ -1,7 +1,7 @@
# WikiPlugin properties. Use it wise.
#extensions for images to be inlined, coma-separated
-imagePatterns = .png , .jpeg , .gif , .bmp
+imagePatterns = .png , .jpeg, .jpg , .gif , .bmp
#wikiHome part of url. Leave it you use default portlet conifguration
wikiHome = /portal/index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action
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-26 10:52:10 UTC (rev 968)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-26 10:58:17 UTC (rev 969)
@@ -37,8 +37,8 @@
if ((type == null)||(type.equals("HTML"))) {
if (logedIn.equals("true")) {
- out.print("<a href='"+actionURL+"&action=Edit&page="+wikiPage+"'><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\"</img></a>\n"+
- "<a href=\""+actionURL+"&action=Attach\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\"</img></a>");
+ out.print("<a href=\""+actionURL+"&action=Edit&page="+wikiPage+"\"><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\" /></a>\n"+
+ "<a href=\""+actionURL+"&action=Attach&page="+wikiPage+"\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\" /></a>");
}
else {
@@ -50,7 +50,7 @@
<%
if ((type == null)||(type.equals("HTML"))) {
- out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\"/file-access/default/members/jbosswiki/images/historyButton.png\"</img></a><br />");
+ out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\"/file-access/default/members/jbosswiki/images/historyButton.png\" /></a><br />");
}
%>
<input type="text" name="searchQuery" />
|
550 messages has been excluded from this view by a project administrator.
