Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r851 - in qa/forge/jira-extensions: developersinvolvement-report/src/java/pl/net/mamut/jira jira-file-modifications/jira-3.2/edit-webapp/includes/decorators junit-tests-adamw junit-tests-adamw/src/etc/pl/net/mamut/jira junit-tests-adamw/src/java/pl/net/mamut/jira voting voting/src/java/com/atlassian/jira/issue/vote voting/src/java/com/atlassian/jira/web/action/admin/voting
Author: dam...@jb... Date: 2005-08-15 06:32:26 -0400 (Mon, 15 Aug 2005) New Revision: 851 Removed: qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/.bodytop.jsp.swp Modified: qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/bodytop.jsp qa/forge/jira-extensions/junit-tests-adamw/.classpath qa/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java qa/forge/jira-extensions/voting/.classpath qa/forge/jira-extensions/voting/.project qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/issue/vote/DefaultVoteManager.java qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddVotesAssigment.java qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/DeleteScheme.java Log: MERGED: -r 824:849 https://svn.labs.jboss.com/trunk/forge/jira-extensions into qa jira-extensions Modified: qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java =================================================================== --- qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/developersinvolvement-report/src/java/pl/net/mamut/jira/DevelopersInvolvementReport.java 2005-08-15 10:32:26 UTC (rev 851) @@ -39,7 +39,7 @@ private ProjectManager projectManager; private IssueManager issueManager; private ActionManager actionManager; - private String[] colours = {"green", "red", "blue", "yellow", "brown", "orange", "violet"}; + private String[] colours = {"#cc0000", "#00cc00", "#0000cc", "#C0C030", "#663300", "#bbbbbb", "#003366"}; private int COL_NUM = 7; private int GRAPH_MULT = 40; //width of one unit in drawing graphs private int TOP_TEN_SHOW = 10; Deleted: qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/.bodytop.jsp.swp =================================================================== (Binary files differ) Modified: qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/bodytop.jsp =================================================================== --- qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/bodytop.jsp 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/jira-file-modifications/jira-3.2/edit-webapp/includes/decorators/bodytop.jsp 2005-08-15 10:32:26 UTC (rev 851) @@ -114,13 +114,13 @@ </page:applyDecorator> <page:applyDecorator name="navitem"> - <page:param name="title">GLOBAL REPORTS</page:param> + <page:param name="title">REPORTS</page:param> <page:param name="id">global_reports</page:param> <page:param name="url"><%= request.getContextPath() %>/secure/views/globalreports/globalreports.jsp</page:param> <page:param name="selected">/secure/views/globalreports/globalreports.jsp</page:param> <page:param name="selected2">/secure/views/globalreports/globalreports.jsp</page:param> - <page:param name="tooltip">View available global reports</page:param> - <page:param name="accesskey">l</page:param> + <page:param name="tooltip">View available reports</page:param> + <page:param name="accesskey">g</page:param> </page:applyDecorator> <page:applyDecorator name="navitem"> Modified: qa/forge/jira-extensions/junit-tests-adamw/.classpath =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/.classpath 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/junit-tests-adamw/.classpath 2005-08-15 10:32:26 UTC (rev 851) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry output="target/test-classes" kind="src" path="src/java"/> + <classpathentry kind="src" path="src/etc"/> <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="MAVEN_REPO/httpunit/jars/httpunit-1.6.jar"/> Modified: qa/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/junit-tests-adamw/src/etc/pl/net/mamut/jira/jira_tests.properties 2005-08-15 10:32:26 UTC (rev 851) @@ -1,5 +1,6 @@ # Name of the host on which jira is running (URL of the JIRA main page) -host=http://localhost:8080/jira +#host=http://localhost:8080/jira +host=http://dev03.atl.jboss.com/jira/ # Login and password of JIRA administrator #adminLogin=adamw #adminPassword=adamw Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/AbstractJiraTest.java 2005-08-15 10:32:26 UTC (rev 851) @@ -49,7 +49,12 @@ userPassword = properties.getProperty("userPassword"); host = properties.getProperty("host"); - /*adminLogin = "adamw"; + /*adminLogin = "00testuser1"; + adminPassword = "00TesTUseR1"; + userLogin = "00testuser2"; + userPassword = "00TesTUseR2"; + host = "http://dev03.atl.jboss.com/jira/"; + adminLogin = ""; adminPassword = "adamw"; userLogin = "user1"; userPassword = "user1"; @@ -88,7 +93,7 @@ link = wc.getCurrentPage().getLinkWith("Log in again"); link.click(); } - + WebForm form = wc.getCurrentPage().getFormWithName("loginform"); form.setParameter("os_username", username); form.setParameter("os_password", password); @@ -221,6 +226,7 @@ wr.setParameter("fixVersions", fixVersions); wr.setParameter("assignee", assignToAdmin ? adminLogin : userLogin); wr.setParameter("reporter", adminLogin); + wr.setParameter("duedate", ""); wc.sendRequest(wr); @@ -298,7 +304,7 @@ * @throws Exception */ protected String addProject(String name, String key, boolean leadIsAdmin) throws Exception { - goToAdministration(); + /*goToAdministration(); goToLink("Projects"); goToLink("Add Project"); @@ -306,7 +312,19 @@ form.setParameter("name", name); form.setParameter("key", key); form.setParameter("lead", leadIsAdmin ? adminLogin : userLogin); - form.submit(); + form.submit();*/ + + WebRequest wr = new GetMethodWebRequest(host+"/secure/admin/AddProject.jspa"); + wr.setParameter("key", key); + wr.setParameter("name", name); + wr.setParameter("url", ""); + wr.setParameter("lead", leadIsAdmin ? adminLogin : userLogin); + wr.setParameter("assigneeType", "2"); + wr.setParameter("notificationScheme", "-1"); + wr.setParameter("permissionScheme", "0"); + wr.setParameter("issueSecurityScheme", "-1"); + + wc.sendRequest(wr); return getProjectId(name); } @@ -339,6 +357,7 @@ wr.setParameter("pid", projectId); wr.setParameter("name", name); wr.setParameter("releaseDate", releaseDate); + wr.setParameter("scheduleAfterVersion", "-1"); wc.sendRequest(wr); @@ -348,6 +367,8 @@ wr = new GetMethodWebRequest(host+"/secure/project/EditVersionReleases!release.jspa"); wr.setParameter("versionId", versionId); wr.setParameter("pid", projectId); + wr.setParameter("commit", "true"); + wr.setParameter("affectsAction", "ignore"); wc.sendRequest(wr); } @@ -451,8 +472,8 @@ */ protected String getAllValue(String name) throws Exception { String page = wc.getCurrentPage().getText(); - page = page.substring(page.indexOf(name), page.length()); - page = page.substring(page.indexOf("<option value=\"")+16, page.length()); + page = page.substring(page.indexOf("<select multiple name=\""+name), page.length()); + page = page.substring(page.indexOf("<option value=\"")+15, page.length()); int pos = 3; while (page.charAt(pos) != '"') pos++; return page.substring(0, pos); Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/ReleaseNotesReportTest.java 2005-08-15 10:32:26 UTC (rev 851) @@ -42,7 +42,7 @@ issRep2 = getIssueRepresentation(prjId, "issue2"); issRep3 = getIssueRepresentation(prjId, "issue3"); - closeIssue(issId1, issRep1, "3", null, new String[] { verId1, verId2 }); + closeIssue(issId1, issRep1, "3", adminLogin, new String[] { verId1, verId2 }); } protected void tearDown() throws Exception { @@ -52,7 +52,7 @@ } public void testMultipleVersionsAllTypes() throws Exception { - goToReportConf(prjId, "pl.net.mamut:releasenotes"); + goToReportConf(prjId, "pl.net.mamut:releasenotes"); String allSections = getAllValue("sections"); WebRequest wr = getReportRequest(prjId, "pl.net.mamut:releasenotes"); Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/UnreleasedProjectVersionsReportTest.java 2005-08-15 10:32:26 UTC (rev 851) @@ -71,6 +71,7 @@ public void testMultipleProjectsAllTypesAllPrioritiesOneMonth() throws Exception { WebRequest wr = getGlobalReportRequest("pl.net.mamut.jira.roadmapreport:roadmap"); + wr.setParameter("projects", new String [] { prjIds[0], prjIds[1] }); wr.setParameter("types", allTypes); wr.setParameter("priorities", allPriorities); Modified: qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java =================================================================== --- qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/junit-tests-adamw/src/java/pl/net/mamut/jira/VotingExtensionsTest.java 2005-08-15 10:32:26 UTC (rev 851) @@ -105,12 +105,12 @@ vsIds = new String[2]; for (int i=0; i<2; i++) vsIds[i] = addVotingScheme("WS"+i, "WS"+i+"desc"); - addVotesAssigment(vsIds[0], "21", "Single_User", "user1", ""); - addVotesAssigment(vsIds[0], "88", "Single_User", "adamw", ""); + addVotesAssigment(vsIds[0], "21", "Single_User", userLogin, ""); + addVotesAssigment(vsIds[0], "88", "Single_User", adminLogin, ""); addVotesAssigment(vsIds[0], "65", "Group_Dropdown", "jira-administrators", ""); addVotesAssigment(vsIds[1], "12", "Project_Lead", "", ""); - addVotesAssigment(vsIds[1], "7", "Single_User", "adamw", ""); + addVotesAssigment(vsIds[1], "7", "Single_User", adminLogin, ""); goToMainPage(); loginUser(); Modified: qa/forge/jira-extensions/voting/.classpath =================================================================== --- qa/forge/jira-extensions/voting/.classpath 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/voting/.classpath 2005-08-15 10:32:26 UTC (rev 851) @@ -1,352 +1,182 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <classpathentry kind="src" path="src/java"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira/jars/atlassian-jira-3.0.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-core/jars/atlassian-core-2.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-ofbiz/jars/atlassian-ofbiz-0.1.8.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-profiling/jars/atlassian-profiling-1.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-configurableobjects/jars/atlassian-configurableobjects-0.4.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-mail/jars/atlassian-mail-1.2.13.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-scheduler/jars/atlassian-scheduler-0.6.6.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-velocity/jars/atlassian-velocity-0.1.8.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-johnson/jars/atlassian-johnson-0.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-plugins/jars/atlassian-plugins-0.2.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/seraph/jars/seraph-0.7.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira-extras/jars/atlassian-jira-extras-0.5.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-tagutil/jars/atlassian-tagutil-0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/oscache/jars/oscache-DEV.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/osworkflow/jars/osworkflow-17Aug2004.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/oscore/jars/oscore-2.2.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/osuser/jars/osuser-1.0-dev-28Jul04.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/propertyset/jars/propertyset-1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/sitemesh/jars/sitemesh-2.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-1.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-pell-multipartrequest1.30rc1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-digester/jars/commons-digester-1.4.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-2.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-1.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/lucene/jars/lucene-1.4-final.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-jdk1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-j1.3-j2ee1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-DEV.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymock-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymockclassextension-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-j1.3-j2ee1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-jdk1.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/activation/jars/activation-1.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/javamail/jars/javamail-1.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/glue/jars/glue-5.0b2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/bsf/jars/bsf-2.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/bsh/jars/bsh-1.2b7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-share-2.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-entity-2.1.1-atlassian-01042004.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-service-2.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-extutil-2.1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/csv/jars/csv-20.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-xerces-serialize.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/quartz/jars/quartz-1.0.7.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/picocontainer/jars/picocontainer-1.0.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jzlib/jars/jzlib-1.0.5.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jsch/jars/jsch-0.1.16-20040721-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/javacvs/jars/javacvs-20040721-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/statcvs/jars/statcvs-20040721-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.1-patched.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jndi/jars/jndi-1.2.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jta/jars/jta-1.0.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/ots-jts/jars/ots-jts_1.0.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-jrmp_stubs-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-iiop_stubs-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jonas_timer-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/objectweb-datasource-1.4.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-1.5.2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-properties.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/xapool/jars/xapool-1.3.1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xerces-1.4.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-20030310.073407.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-junit-20030211.141731.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-util-20030211.141939.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-email-20030211.144034.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-log-20030211.142821.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-http-20030211.143043.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-soap-20030211.142401.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-sql-20030211.144816.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-jexl/jars/commons-jexl-1.0-beta-2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.4.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/atlassian-trackback/jars/atlassian-trackback-0.7.3.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0-beta2.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="var" path="MAVEN_REPO/xmlrpc/jars/xmlrpc-1.2-b1.jar"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.4.2"> - <attributes> - </attributes> - </classpathentry> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry excluding="" kind="src" path="src/java"> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira/jars/atlassian-jira-3.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/global-reports-plugins/jars/global-reports-plugins-1.0.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-core/jars/atlassian-core-2.3.9.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-ofbiz/jars/atlassian-ofbiz-0.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-profiling/jars/atlassian-profiling-1.1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-configurableobjects/jars/atlassian-configurableobjects-0.4.11.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-mail/jars/atlassian-mail-1.2.30.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-scheduler/jars/atlassian-scheduler-0.6.6.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-velocity/jars/atlassian-velocity-0.3.9.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-johnson/jars/atlassian-johnson-0.5.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-plugins/jars/atlassian-plugins-0.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/seraph/jars/seraph-0.7.5.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-jira-extras/jars/atlassian-jira-extras-0.5.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-tagutil/jars/atlassian-tagutil-0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/oscache/jars/oscache-DEV.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/osworkflow/jars/osworkflow-17Aug2004.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/oscore/jars/oscore-2.2.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/osuser/jars/osuser-1.0-dev-28Jul04.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/propertyset/jars/propertyset-1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/sitemesh/jars/sitemesh-2.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/webwork/jars/webwork-pell-multipartrequest1.30rc1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-digester/jars/commons-digester-1.4.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-2.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-1.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/lucene/jars/lucene-1.4-final.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-jdk1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/alt/jars/alt-0.07-j1.3-j2ee1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-DEV.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymock-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/easymock/jars/easymockclassextension-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-j1.3-j2ee1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-0.07-jdk1.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/activation/jars/activation-1.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/javamail/jars/javamail-1.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/glue/jars/glue-5.0b2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/bsf/jars/bsf-2.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/bsh/jars/bsh-1.2b7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-share-2.1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-entity-2.1.1-atlassian-01042004.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-service-2.1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-extutil-2.1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/csv/jars/csv-20.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ofbcore/jars/ofbcore-xerces-serialize.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/quartz/jars/quartz-1.0.7.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/picocontainer/jars/picocontainer-1.0.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jzlib/jars/jzlib-1.0.5.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jsch/jars/jsch-0.1.16-20040721-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/javacvs/jars/javacvs-20040721-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/statcvs/jars/statcvs-20040721-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.1-patched.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jndi/jars/jndi-1.2.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jta/jars/jta-1.0.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/ots-jts/jars/ots-jts_1.0.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-jrmp_stubs-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jotm-iiop_stubs-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/jonas_timer-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/jotm/jars/objectweb-datasource-1.4.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-1.5.2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/carol/jars/carol-properties.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/xapool/jars/xapool-1.3.1.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xerces-1.4.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-20030310.073407.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-junit-20030211.141731.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-util-20030211.141939.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-email-20030211.144034.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-log-20030211.142821.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-http-20030211.143043.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-soap-20030211.142401.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-tags-sql-20030211.144816.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-jexl/jars/commons-jexl-1.0-beta-2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.4.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/atlassian-trackback/jars/atlassian-trackback-0.7.3.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0-beta2.jar"> + </classpathentry> + <classpathentry kind="var" path="MAVEN_REPO/xmlrpc/jars/xmlrpc-1.2-b1.jar"> + </classpathentry> + <classpathentry kind="output" path="target/classes"> + </classpathentry> +</classpath> \ No newline at end of file Modified: qa/forge/jira-extensions/voting/.project =================================================================== --- qa/forge/jira-extensions/voting/.project 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/voting/.project 2005-08-15 10:32:26 UTC (rev 851) @@ -1,27 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> - <name>Voting</name> - <comment>An extended release notes plugin.</comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/MavenVoting.launch</value> - </dictionary> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> + <name>voting-extended</name> + <comment>An extended voting project.</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Modified: qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/issue/vote/DefaultVoteManager.java =================================================================== --- qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/issue/vote/DefaultVoteManager.java 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/issue/vote/DefaultVoteManager.java 2005-08-15 10:32:26 UTC (rev 851) @@ -5,6 +5,8 @@ import com.atlassian.jira.ManagerFactory; import com.atlassian.jira.config.properties.ApplicationProperties; import com.atlassian.jira.issue.cache.CacheManager; +import com.atlassian.jira.issue.index.IndexException; +import com.atlassian.jira.issue.index.IssueIndexManager; import com.atlassian.jira.voting.VotingManagerFactory; import com.atlassian.jira.voting.VotingSchemeManager; import com.opensymphony.user.EntityNotFoundException; @@ -131,6 +133,14 @@ return false; } cacheManager.flush("Issue_Cache", issue); + try + { + indexManager.reIndex(issue); + } + catch(IndexException e) + { + log.error("Exception re-indexing issue " + e, e); + } } return true; } @@ -145,11 +155,14 @@ return getVoters(issue).contains(user); } - public DefaultVoteManager(ApplicationProperties applicationProperties, AssociationManager associationManager, CacheManager cacheManager) + public DefaultVoteManager(ApplicationProperties applicationProperties, + AssociationManager associationManager, CacheManager cacheManager, + IssueIndexManager indexManager) { this.applicationProperties = applicationProperties; this.associationManager = associationManager; this.cacheManager = cacheManager; + this.indexManager = indexManager; votingSchemeManager = VotingManagerFactory.getVotingSchemeManager(); } @@ -158,6 +171,7 @@ private final AssociationManager associationManager; private final CacheManager cacheManager; private final VotingSchemeManager votingSchemeManager; + private final IssueIndexManager indexManager; static { @@ -182,6 +196,14 @@ issue.set("votes", new Long(votes)); issue.store(); cacheManager.flush("Issue_Cache", issue); + try + { + indexManager.reIndex(issue); + } + catch(IndexException e) + { + log.error("Exception re-indexing issue " + e, e); + } } } catch (GenericEntityException e) { Modified: qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddVotesAssigment.java =================================================================== --- qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddVotesAssigment.java 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/AddVotesAssigment.java 2005-08-15 10:32:26 UTC (rev 851) @@ -27,6 +27,12 @@ { try { + try { + if (Long.parseLong(getVotesnum()) < 0) + throw new NumberFormatException(); + } catch (NumberFormatException e) { + addErrorMessage("Number of votes must be a positive integer."); + } if(getSchemeId() == null || getScheme() == null) addErrorMessage("You must select a scheme to add the votes assigment to. Click \"Voting Schemes\" link in the left hand navigation to pick one."); if(getVotesnum() == null || !TextUtils.stringSet(getVotesnum())) Modified: qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/DeleteScheme.java =================================================================== --- qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/DeleteScheme.java 2005-08-15 10:22:12 UTC (rev 850) +++ qa/forge/jira-extensions/voting/src/java/com/atlassian/jira/web/action/admin/voting/DeleteScheme.java 2005-08-15 10:32:26 UTC (rev 851) @@ -28,7 +28,8 @@ String ret = super.doExecute(); new DefaultVoteManager(this.getApplicationProperties(), associationManager, - ManagerFactory.getCacheManager()).recountVotes(projects); + ManagerFactory.getCacheManager(), + ManagerFactory.getIndexManager()).recountVotes(projects); return ret; } |
