Saurabh, I'm having some trouble applying your patch. There is a merge conflict in:
sql/latest-schema.sql There are also several files that already exist, so I'm not sure why your patch is trying to add them: Failed to apply patch for file src/org/mifos/application/moratorium/business/MoratoriumBO.hbm.xml: File MoratoriumBO.hbm.xml already exists Failed to apply patch for file src/org/mifos/application/moratorium/business/MoratoriumBO.java: File MoratoriumBO.java already exists Failed to apply patch for file src/org/mifos/application/moratorium/business/service/MoratoriumBusinessService.java: File MoratoriumBusinessService.java already exists Failed to apply patch for file src/org/mifos/application/moratorium/exceptions/MoratoriumException.java: File MoratoriumException.java already exists Failed to apply patch for file src/org/mifos/application/moratorium/persistence/MoratoriumPersistence.java: File MoratoriumPersistence.java already exists Failed to apply patch for file src/org/mifos/application/moratorium/struts/action/MoratoriumAction.java: File MoratoriumAction.java already exists Failed to apply patch for file src/org/mifos/application/moratorium/struts/actionforms/MoratoriumActionForm.java: File MoratoriumActionForm.java already exists Failed to apply patch for file src/org/mifos/application/moratorium/util/resources/MoratoriumConstants.java: File MoratoriumConstants.java already exists Failed to apply patch for file src/org/mifos/application/moratorium/util/resources/MoratoriumUIResources.properties: File MoratoriumUIResources.properties already exists Failed to apply patch for file src/org/mifos/doc-root/application/moratorium/jsp/applyBranchMoratoriumConfirm.jsp: File applyBranchMoratoriumConfirm.jsp already exists Failed to apply patch for file src/org/mifos/doc-root/application/moratorium/jsp/applyMoratorium.jsp: File applyMoratorium.jsp already exists Failed to apply patch for file src/org/mifos/doc-root/application/moratorium/jsp/applyMoratoriumConfirm.jsp: File applyMoratoriumConfirm.jsp already exists Failed to apply patch for file src/org/mifos/doc-root/application/moratorium/jsp/applyMoratoriumForBranch.jsp: File applyMoratoriumForBranch.jsp already exists Failed to apply patch for file src/org/mifos/doc-root/application/moratorium/jsp/configureBranchMoratorium.jsp: File configureBranchMoratorium.jsp already exists Failed to apply patch for file src/org/mifos/doc-root/application/moratorium/jsp/configureClientMoratorium.jsp: File configureClientMoratorium.jsp already exists Failed to apply patch for file src/org/mifos/doc-root/application/moratorium/jsp/configureMoratorium.jsp: File configureMoratorium.jsp already exists Failed to apply patch for file src/org/mifos/doc-root/application/moratorium/jsp/editMoratoriums.jsp: File editMoratoriums.jsp already exists Failed to apply patch for file src/org/mifos/doc-root/application/moratorium/jsp/editMoratoriumsPreview.jsp: File editMoratoriumsPreview.jsp already exists Failed to apply patch for file src/org/mifos/doc-root/application/moratorium/jsp/moratoriumSearchResults.jsp: File moratoriumSearchResults.jsp already exists Failed to apply patch for file src/org/mifos/doc-root/application/moratorium/jsp/viewMoratoriums.jsp: File viewMoratoriums.jsp already exists Failed to apply patch for file test/org/mifos/application/moratorium/business/service/TestMoratoriumBusinessService.java: File TestMoratoriumBusinessService.java already exists Failed to apply patch for file test/org/mifos/application/moratorium/business/TestMoratoriumBO.java: File TestMoratoriumBO.java already exists Failed to apply patch for file test/org/mifos/application/moratorium/persistence/TestMoratoriumPersistence.java: File TestMoratoriumPersistence.java already exists Failed to apply patch for file test/org/mifos/application/moratorium/struts- config.xml: File struts-config.xml already exists Failed to apply patch for file test/org/mifos/application/moratorium/struts/action/TestMoratoriumAction.java: File TestMoratoriumAction.java already exists Failed to apply patch for file test/org/mifos/application/moratorium/struts/actionforms/TestMoratoriumActionForm.java: File TestMoratoriumActionForm.java already exists Failed to apply patch for file test/org/mifos/application/moratorium/util/resources/MoratoriumUIResources.properties: File MoratoriumUIResources.properties already exists Failed to apply patch for file test/org/mifos/application/moratorium/validation.xml: File validation.xmlalready exists Failed to apply patch for file test/org/mifos/application/moratorium/validator-rules.xml: File validator-rules.xml already exists Please make these corrections and re-submit the patch. Thanks! -Tom On Nov 5, 2007 4:46 AM, Saurabh Kumar <[EMAIL PROTECTED]> wrote: > > > Hi Van, > > > > I have integrated the code with revision 12171. > > > > The test suite is running fine, and there are no build errors. > > > > Please find the patch attached with the mail. > > > > Do let me know if there are any issues. > > > > *Thanks & Regards,* > > *Saurabh Kumar* • Developer • SunGard • Offshore Services • Divyasree > Chambers, Langford Road, Bangalore 560025 India > Tel +91-80-2222-0501 • Mobile +91-9886945575 • Fax +91-80-2222-0511 • > www.sungard.com > > -----Original Message----- > *From:* [EMAIL PROTECTED] [mailto: > [EMAIL PROTECTED] *On Behalf Of *Van > Mittal-Henkle > *Sent:* Monday, November 05, 2007 1:01 PM > *To:* Developer > *Subject:* Re: [Mifos-developer] Patch for moratorium module.... > > > > Hi Saurabh, > > > > Could you please update to revision 12171 (or later) and confirm whether > this probem has been resolved. If the you no longer see the issue, then > please resubmit your patch. > > > > thanks, > > --Van > > > ------------------------------ > > *From:* [EMAIL PROTECTED] [mailto: > [EMAIL PROTECTED] *On Behalf Of *Saurabh > Kumar > *Sent:* Thursday, October 25, 2007 6:32 AM > *To:* [email protected] > *Subject:* [Mifos-developer] Patch for moratorium module.... > > > > Hi All, > > > > We are done with the coding of moratorium module. However there are still > some open issues, which are not implemented. > > Once we get clarification on the open issues, we will send the updated > patch. I m attaching a document with the mail, which describes the approach > we have followed as well as open issues. > > > > We checked out latest code from SVN but the build is getting failed > because of test suite failure. > > After applying the patch send by Dion, the test suite executes > successfully but some other functional issues are coming, like, we are > unable to create center, when we try to create meeting details for center we > get following error - > > javax.servlet.ServletException: Unable to find a value for "id" in object > of class "org.mifos.application.meeting.util.helpers.WeekDay" using > operator "." > > > > Can anyone throw some light on this problem? > > > > We checked out Revision >> 12167 > > *Thanks & Regards,* > > *Saurabh Kumar* • Developer • SunGard • Offshore Services • Divyasree > Chambers, Langford Road, Bangalore 560025 India > Tel +91-80-2222-0501 • Mobile +91-9886945575 • Fax +91-80-2222-0511 • > www.sungard.com > > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Splunk Inc. > Still grepping through log files to find problems? Stop. > Now Search log events and configuration files using AJAX and a browser. > Download your FREE copy of Splunk now >> http://get.splunk.com/ >
------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
