{"push_id":566679368,"size":29,"distinct_size":1,"ref":"refs/heads/KRACOEUS_8777_1","head":"6a7c972a649924e6f2fe54ef094e20b6e890294d","before":"d47f8adbf473547a978fb52e25c3e04f5d3a2139","commits":[{"sha":"36480a289ba551da181442a5dc052c9fecb809dd","author":{"email":"541374c661a1bb94f43153fe483afb20534ba03b@iastate.edu","name":"Joe Williams"},"message":"KRACOUES-8764:fix additional equipment system generated attachments","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/36480a289ba551da181442a5dc052c9fecb809dd"},{"sha":"7ea052db65075ce4d3958d30df2fa1005e53a7f4","author":{"email":"541374c661a1bb94f43153fe483afb20534ba03b@iastate.edu","name":"Joe Williams"},"message":"KRACOEUS-8784:make sub award line items non editable from periods page","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/7ea052db65075ce4d3958d30df2fa1005e53a7f4"},{"sha":"d9b846d119222ba6ead2697277fd63d815b62a5e","author":{"email":"541374c661a1bb94f43153fe483afb20534ba03b@iastate.edu","name":"Joe Williams"},"message":"KRACOEUS-8760:moved version and sql info to footer","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/d9b846d119222ba6ead2697277fd63d815b62a5e"},{"sha":"3f08fb1f703f3496d137defe764e804d9b5e4933","author":{"email":"ac47e8514f6d19a37947ff2533e0be07b4576c96@gmail.com","name":"Travis Schneeberger"},"message":"Merge pull request #1543 from jwillia/KRACOEUS_8760_2\n\nKRACOEUS-8760:moved version and sql info to footer","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/3f08fb1f703f3496d137defe764e804d9b5e4933"},{"sha":"34e1abbe3b81d6ffcb733269cdf75d846cd3b797","author":{"email":"ac47e8514f6d19a37947ff2533e0be07b4576c96@gmail.com","name":"Travis Schneeberger"},"message":"Merge pull request #1556 from jwillia/KRACOEUS_8784_1\n\nKRACOEUS-8784:make sub award line items non editable from periods page","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/34e1abbe3b81d6ffcb733269cdf75d846cd3b797"},{"sha":"b29c8f46fd05b1a958ba23b4dbac3febf1025771","author":{"email":"ac47e8514f6d19a37947ff2533e0be07b4576c96@gmail.com","name":"Travis Schneberger"},"message":"KRACOEUS-8776: lic header issue","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/b29c8f46fd05b1a958ba23b4dbac3febf1025771"},{"sha":"e973c2aa9682d3ba4c6579ad9956368296fea62e","author":{"email":"fb7922595ad9c210c0f3ce773f00cc8b9d8e21f3@kuali.co","name":"tdurkin"},"message":"Merge pull request #1558 from leoherbie/KRACOEUS-8776\n\nKRACOEUS-8776: lic header issue","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/e973c2aa9682d3ba4c6579ad9956368296fea62e"},{"sha":"b0e5a9abcf8053371659df415c8082422671b645","author":{"email":"541374c661a1bb94f43153fe483afb20534ba03b@iastate.edu","name":"Joe Williams"},"message":"KRACOEUS-8786:fixed subaward close out date constraint issues","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/b0e5a9abcf8053371659df415c8082422671b645"},{"sha":"bd780608c82c5dcda20fdc637e4cd9dc239c8cfb","author":{"email":"541374c661a1bb94f43153fe483afb20534ba03b@iastate.edu","name":"Joe Williams"},"message":"KRACOEUS-8783:allow routing actions for proposals accessed through proposal search","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/bd780608c82c5dcda20fdc637e4cd9dc239c8cfb"},{"sha":"ef3d3ba03a72a3b0596d4dbce870a41a9fa7ee45","author":{"email":"80d87824e5740a2423ce43a9f624b6039883e190@genesistec.com","name":"rmancher"},"message":"KRACOEUS-7863\nImplement Budget Non-Personnel Costs - Formulated Costs","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/ef3d3ba03a72a3b0596d4dbce870a41a9fa7ee45"},{"sha":"0f6e2b771e5e2d9bfb95401cbb60e75a64d7ccfc","author":{"email":"ac47e8514f6d19a37947ff2533e0be07b4576c96@gmail.com","name":"Travis Schneberger"},"message":"KRACOEUS-8773: fixing a NPE","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/0f6e2b771e5e2d9bfb95401cbb60e75a64d7ccfc"},{"sha":"b20d724872eda17cc19650ce53ee3f5ceb74ecd4","author":{"email":"541374c661a1bb94f43153fe483afb20534ba03b@iastate.edu","name":"Joe Williams"},"message":"KRACOEUS-8789:subaward sync from pdf refreshes details section","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/b20d724872eda17cc19650ce53ee3f5ceb74ecd4"},{"sha":"0825eb1b2987beff2c2975ae552230c94df37b75","author":{"email":"c56a79f26f5e29afd76624b82e6123e28e5643be@email.arizona.edu","name":"Gayathri Athreya"},"message":"Merge pull request #1562 from leoherbie/KRACOEUS-8773\n\nKRACOEUS-8773: fixing a NPE","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/0825eb1b2987beff2c2975ae552230c94df37b75"},{"sha":"923121dcf033c331c24f0b34b909459f264d425f","author":{"email":"27823230b0215b69cc3ec0a44b29b45ed2070021@gmail.com","name":"Douglas Pace"},"message":"Merge pull request #1548 from jwillia/KRACOEUS_8764_1\n\nKRACOUES-8764:fix additional equipment system generated attachments","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/923121dcf033c331c24f0b34b909459f264d425f"},{"sha":"6c5233757af83655af89bc4589ce3b2f56e64f7a","author":{"email":"27823230b0215b69cc3ec0a44b29b45ed2070021@gmail.com","name":"Douglas Pace"},"message":"Merge pull request #1559 from jwillia/KRACOEUS_8786_1\n\nKRACOEUS-8786:fixed subaward close out date constraint issues","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/6c5233757af83655af89bc4589ce3b2f56e64f7a"},{"sha":"03d4f0283585175c6997624ea9abc31c4ff73314","author":{"email":"27823230b0215b69cc3ec0a44b29b45ed2070021@gmail.com","name":"Douglas Pace"},"message":"Merge pull request #1560 from jwillia/KRACOEUS_8783_1\n\nKRACOEUS-8783:allow routing actions for proposals accessed through propo...","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/03d4f0283585175c6997624ea9abc31c4ff73314"},{"sha":"69755107a42a355ef82d68bf8e6e5dfbf30473d3","author":{"email":"27823230b0215b69cc3ec0a44b29b45ed2070021@gmail.com","name":"Douglas Pace"},"message":"Merge pull request #1561 from rmancher/budget-non-personnel-formulated-cost\n\nKRACOEUS-7863","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/69755107a42a355ef82d68bf8e6e5dfbf30473d3"},{"sha":"e777f09fc88a7ccfb88e79567712508a3c64013e","author":{"email":"27823230b0215b69cc3ec0a44b29b45ed2070021@gmail.com","name":"Douglas Pace"},"message":"Merge pull request #1563 from jwillia/KRACOEUS_8789_1\n\nKRACOEUS-8789:subaward sync from pdf refreshes details section","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/e777f09fc88a7ccfb88e79567712508a3c64013e"},{"sha":"1ae2630486ac0ef911c1ffa8127b9e15ae60d1ce","author":{"email":"3161cdc7bf197e4c3a35b9cbe358c79910f27e90@speelmon.com","name":"Lance Speelmon"},"message":"CX Version Changes -- Primarily Bug Fixes\n\ng diff -w kc-release-5_2_1-tag..rsmart-5.2.1 --stat=999 >! git_diff_kc-release-5_2_1-tag..rsmart-5.2.1_stat.txt\n\nRemoved all files we do not want to consider for merge\n\nnormalize changed files we want to merge\n\nCreate patches for kc-release-5_2_1-tag..rsmart-5.2.1 diffs\n\nmap relocated path for files that could not be automatically matched\n\nAdded missing patches from: Create patches for kc-release-5_2_1-tag..rsmart-5.2.1 diffs\n\nremoved trailing space from patch file\n\nbasic patch rewriting script ready\n\nsquashed some path rewriting logic bugs; smoke testing LGTM\n\n./rewrite_patches.rb\n\nadd CX_PORTING.md\n\nManually merged `cb38ce9` KualiCo pom.xml changes.\n\nConflicts:\n\tpom.xml\n\nupdated CX_PORTING for cx_patches/pom.xml.patch\n\napplied cx_patches/src/main/config/kew/xml/2/AwardDocument.xml.patch\n\ncx_patches/src/main/config/sql/current/5.2.1/dml/KR_DML_01_KRACOEUS-6640_B000.sql.patch\n\ncx_patches/src/main/config/sql/current/5.2.1/sequences/KC_SEQ_S2S_USER_ATTACHED_FORM_ID.sql.patch\n\ncx_patches/src/main/config/sql/current/5.2.1/sequences/KC_SEQ_S2S_USER_ATTD_FORM_ATT_ID.sql.patch\n\ncx_patches/src/main/config/sql/current_mysql/0.0.0/dml/KR_DML_01_KCINFR-1018_B000.sql.patch\n\ncx_patches/src/main/config/sql/current_mysql/5.2.1/dml/KR_DML_01_KRACOEUS-6640_B000.sql.patch\n\ncx_patches/src/main/config/sql/current_mysql/5.2.1/sequences/KC_SEQ_S2S_USER_ATTACHED_FORM_ATT_ID.sql.patch\n\ncx_patches/src/main/config/sql/current_mysql/5.2.1/sequences/KC_SEQ_S2S_USER_ATTACHED_FORM_ID.sql.patch\n\ncx_patches/src/main/config/sql/current_mysql/5.2.1/tables/KC_TBL_CONTACT_USAGE.sql.patch\nFixes: Caused by: java.sql.SQLException: Can't create table `coeus`.`#sql-c8e0_78` (errno: 150 \"Foreign key constraint is incorrectly formed\")\nCaused by: com.googlecode.flyway.core.command.FlywaySqlScriptException: Error executing statement at line 3: ALTER TABLE CONTACT_USAGE\n\ncx_patches/src/main/config/sql/RELEASE-SCRIPTS/KC_Install.sh.patch\n\ncx_patches/src/main/java/com/rsmart/kuali/kra/workflow/UnitAdministratorRoleAttribute.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/award/contacts/AwardSponsorContactAuditRule.java.patch\nAdding rule to check for Country Code. If a country code is not found, an error is reported and the user is taken to the Award Contacts tab to handle it.\nfixes rSmart/issues#448\n\ncx_patches/src/main/java/org/kuali/kra/award/document/authorization/AwardDocumentAuthorizer.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/award/home/Award.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/award/home/AwardAmountInfo.java.patch\nDefault all award amount info amounts to zero when null.\nFixes rSmart/issues#503\n\ncx_patches/src/main/java/org/kuali/kra/award/lookup/AwardLookupableHelperServiceImpl.java.patch\nIgnore missing person/entity for https://github.com/rSmart/issues/issues/179\n\ncx_patches/src/main/java/org/kuali/kra/award/printing/xmlstream/AwardBaseStream.java.patch\nMake rolodex country code optional for Award printing.\nfixes rSmart/issues#448\n\ncx_patches/src/main/java/org/kuali/kra/award/web/struts/action/AwardActionsAction.java.patch\nAdding rule to check for Country Code. If a country code is not found, an error is reported and the user is taken to the Award Contacts tab to handle it.\n\nfixes rSmart/issues#448\n\ncx_patches/src/main/java/org/kuali/kra/award/web/struts/action/AwardHomeAction.java.patch\nCCU STE on Document #9532\njava.lang.NullPointerException\n        at org.kuali.kra.award.web.struts.action.AwardHomeAction.save(AwardHomeAction.java:240)\nhttps://github.com/rSmart/issues/issues/468\n\nAdding null checks to fix NPE.\n\nfixes rSmart/issues#270\n\ncx_patches/src/main/java/org/kuali/kra/bo/KcPerson.java.patch\nReturn a new empty KcPerson from fromEntityAndPersonId when entity is null.\n\ncx_patches/src/main/java/org/kuali/kra/bo/Rolodex.java.patch\n\nCommit: edf06332fe7d3cb3940e9353434523fab5d25033\nDate:   2014-06-30 11:43:17 -0700 (5 months ago)\n\nPatching fix from changeset 19864. This patch adds back the isSponsorAddress property to Rolodex. When isSponsorAddress is\n\"N\", the behavior changes so the Rolodex reflects the Organization address. For this, organizations had to be added to\nRolodex. The maintainable also needed to be modified to recognize isSponsorAddress functionality.\n\nfixes rSmart/issues#201\n\ncx_patches/src/main/java/org/kuali/kra/bo/RolodexMaintainableImpl.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/bo/UnitAdministrator.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/budget/printing/xmlstream/BudgetBaseStream.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/budget/printing/xmlstream/BudgetCumilativeXmlStream.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/budget/printing/xmlstream/BudgetSummaryXmlStream.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/budget/printing/xmlstream/IndustrialBudgetXmlStream.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/budget/web/struts/action/BudgetAction.java.patch\njava.lang.NullPointerException\n        at org.kuali.kra.budget.web.struts.action.BudgetAction.execute(BudgetAction.java:189)\nhttps://github.com/rSmart/issues/issues/417\n\ncx_patches/src/main/java/org/kuali/kra/coi/disclosure/CoiDisclosureServiceImpl.java.patch\nIgnore missing person/entity from org.kuali.kra.protocol.ProtocolActionBase.permissions(ProtocolActionBase.java:123)\n\ncx_patches/src/main/java/org/kuali/kra/coi/notification/CoiNotificationRoleQualifierServiceImpl.java.patch\njava.lang.NullPointerException\n    at org.kuali.kra.coi.notification.CoiNotificationRoleQualifierServiceImpl.getRoleQualifierValue(CoiNotificationRoleQualifierServiceImpl.java:47)\n    at org.kuali.kra.common.notification.NotificationContextBase.populateRoleQualifiers(NotificationContextBase.java:85)\n    at org.kuali.kra.common.notification.service.impl.KcNotificationServiceImpl.getRoleRecipients(KcNotificationServiceImpl.java:434)\n    at org.kuali.kra.common.notification.service.impl.KcNotificationServiceImpl.getNotificationRecipients(KcNotificationServiceImpl.java:352)\n    at org.kuali.kra.common.notification.service.impl.KcNotificationServiceImpl.fillinNotificationObject(KcNotificationServiceImpl.java:623)\n    at org.kuali.kra.common.notification.service.impl.KcNotificationServiceImpl.sendNotificationAndPersist(KcNotificationServiceImpl.java:638)\n    at org.kuali.kra.coi.personfinancialentity.FinancialEntityAction.sendNotificationAndPersist(FinancialEntityAction.java:444)\n    at org.kuali.kra.coi.personfinancialentity.FinancialEntityEditNewAction.submit(FinancialEntityEditNewAction.java:60)\n\nFixes https://github.com/rSmart/issues/issues/377\n\ncx_patches/src/main/java/org/kuali/kra/coi/notification/FinancialEntityNotificationRenderer.java.patch\njava.lang.NullPointerException\n    at org.kuali.kra.coi.notification.FinancialEntityNotificationRenderer.getDefaultReplacementParameters(FinancialEntityNotificationRenderer.java:56)\nFixes https://github.com/rSmart/issues/issues/377\n\ncx_patches/src/main/java/org/kuali/kra/coi/service/impl/CoiMessagesServiceImpl.java.patch\nWhen setting ANNUAL_DISCLOSURE_RENEWAL_DATE system parameter, the year is not parsed correctly.\nhttps://github.com/rSmart/issues/issues/470\n\nFixes java.lang.NullPointerException in CoiMessagesServiceImpl\n\njava.sql.Timestamp.compareTo(Timestamp.java:477)\njava.sql.Timestamp.before(Timestamp.java:447)\norg.kuali.kra.coi.service.impl.CoiMessagesServiceImpl.getMessages(CoiMessagesServiceImpl.java:75)\n\nFixes https://github.com/rSmart/issues/issues/240\n\ncx_patches/src/main/java/org/kuali/kra/committee/lookup/CommitteeLookupableHelperServiceImpl.java.patch\nAdding fix so that iacuc committees now use proper url for resume edit\n\nfixes rSmart/issues#201\n\ncx_patches/src/main/java/org/kuali/kra/common/committee/bo/CommitteeBase.java.patch\njava.lang.NullPointerException\nat org.kuali.kra.common.committee.bo.CommitteeBase.compareTo(CommitteeBase.java:356)\nat org.kuali.kra.common.committee.bo.CommitteeBase.compareTo(CommitteeBase.java:38)\nFixes https://github.com/rSmart/issues/issues/335\n\ncx_patches/src/main/java/org/kuali/kra/common/committee/lookup/CommitteeLookupableHelperServiceImplBase.java.patch\nAdding fix so that iacuc committees now use proper url for resume edit\n\nfixes rSmart/issues#201\n\ncx_patches/src/main/java/org/kuali/kra/common/committee/meeting/CommitteeScheduleAttachmentsBase.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/common/committee/meeting/MeetingActionBase.java.patch\nNPE When Accessing Meeting Actions Tab on IRB Schedule\nhttps://github.com/rSmart/issues/issues/449\n\ncx_patches/src/main/java/org/kuali/kra/common/committee/meeting/MeetingActionsActionBase.java.patch\njava.lang.ArrayIndexOutOfBoundsException: Array index out of range: 0 at java.util.Vector.get(Vector.java:744)\nat org.kuali.kra.common.committee.meeting.MeetingActionsActionBase.viewAgenda(MeetingActionsActionBase.java:205)\nFixes https://github.com/rSmart/issues/issues/307\n\ncx_patches/src/main/java/org/kuali/kra/common/committee/notification/AgendaCreatedNotificationRenderer.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/common/notification/service/impl/KcNotificationServiceImpl.java.patch\nFixes https://github.com/rSmart/issues/issues/377\n\norg.kuali.rice.core.api.exception.RiceIllegalArgumentException: principalName was blank\n        at org.kuali.rice.kim.impl.identity.IdentityServiceImpl.incomingParamCheck(IdentityServiceImpl.java:1566)\n        at org.kuali.rice.kim.impl.identity.IdentityServiceImpl.getEntityByPrincipalName(IdentityServiceImpl.java:125)\n...\n        at org.kuali.kra.common.notification.service.impl.KcNotificationServiceImpl.getRecipientEmailAddresses(KcNotificationServiceImpl.java:542)\n        at org.kuali.kra.common.notification.service.impl.KcNotificationServiceImpl.sendEmailNotification(KcNotificationServiceImpl.java:524)\n        at org.kuali.kra.common.notification.service.impl.KcNotificationServiceImpl.sendNotification(KcNotificationServiceImpl.java:184)\n        at org.kuali.kra.common.notification.service.impl.KcNotificationServiceImpl.sendNotificationAndPersist(KcNotificationServiceImpl.java:630)\n        at org.kuali.kra.coi.personfinancialentity.FinancialEntityAction.sendNotificationAndPersist(FinancialEntityAction.java:444)\n        at org.kuali.kra.coi.personfinancialentity.FinancialEntityEditNewAction.submit(FinancialEntityEditNewAction.java:60)\n\nWorkaround https://github.com/rSmart/issues/issues/158 ; added try/catch to be more forgiving.\n\ncx_patches/src/main/java/org/kuali/kra/iacuc/actions/IacucProtocolActionsAction.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/iacuc/committee/lookup/IacucCommitteeLookupableHelperServiceImpl.java.patch\nAdding fix so that iacuc committees now use proper url for resume edit\n\nfixes rSmart/issues#201\n\ncx_patches/src/main/java/org/kuali/kra/iacuc/protocol/IacucProtocolProtocolAction.java.patch\nAdding fixes specific to IACUC\n\nfixes rSmart/issues#299\n\ncx_patches/src/main/java/org/kuali/kra/institutionalproposal/contacts/InstitutionalProposalPerson.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/institutionalproposal/contacts/InstitutionalProposalProjectPersonnelBean.java.patch\nUMC - NPE when editing a new Institutional Proposal.\nhttps://github.com/rSmart/issues/issues/492\n\ncx_patches/src/main/java/org/kuali/kra/institutionalproposal/proposallog/ProposalLogMergeAction.java.patch\n[SO-27] The session is clearing out the value of the proposal log number before the action can handle it. I switched to by more synchronous\nusing request parameters instead of session data. This is more intuitive to how lookups work anyway. I also added a null check just in case.\n\ncx_patches/src/main/java/org/kuali/kra/institutionalproposal/proposallog/service/impl/ProposalLogServiceImpl.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/institutionalproposal/service/impl/InstitutionalProposalLookupableHelperServiceImpl.java.patch\n[SO-27] The session is clearing out the value of the proposal log number before the action can handle it. I switched to by more synchronous\nusing request parameters instead of session data. This is more intuitive to how lookups work anyway. I also added a null check just in case.\n\nSTE when PD \"Submit to Sponsor\"\njava.lang.NullPointerException\nat org.kuali.kra.institutionalproposal.service.impl.InstitutionalProposalServiceImpl.doBudgetDataFeed(InstitutionalProposalServiceImpl.java:539)\nProp Dev submitted. (PD 104)\napprovals bypassed.\ntry to submit to sponsor as admin.\nget the following STE.\nthis has happened more than once, but not every time.\nhttp://jira.s2.rsmart.com:8080/browse/SO-32\n\ncx_patches/src/main/java/org/kuali/kra/institutionalproposal/service/impl/InstitutionalProposalServiceImpl.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/irb/actions/IrbProtocolActionRequestServiceImpl.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/irb/actions/notification/ProtocolWithdrawnNotificationRenderer.java.patch\nAdding new notification renderer to handle reason and action date types. I tried adding unit tests for this, but they're not working. I'll have to commit those at a later date once I get them to work.\n\nfixes rsmart/issues#414\n\ncx_patches/src/main/java/org/kuali/kra/irb/actions/ProtocolProtocolActionsAction.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/irb/protocol/ProtocolProtocolAction.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/negotiations/notifications/NegotiationNotificationRenderer.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/proposaldevelopment/document/authorizer/NarrativeReplaceAuthorizer.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/proposaldevelopment/document/authorizer/PersonnelAttachmentReplaceAuthorizer.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/proposaldevelopment/notification/ProposalDevelopmentNotificationRenderer.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/proposaldevelopment/rules/ProposalDevelopmentDocumentRule.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/proposaldevelopment/service/impl/ProposalCopyServiceImpl.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/proposaldevelopment/web/struts/form/ProposalDevelopmentForm.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/protocol/actions/ActionHelperBase.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/protocol/notification/ProtocolReplacementParameters.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/questionnaire/answer/QuestionnaireAnswerServiceImpl.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/s2s/service/impl/S2SUtilServiceImpl.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/service/impl/KraAuthorizationServiceImpl.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/subaward/web/struts/action/SubAwardAction.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/subaward/web/struts/action/SubAwardActionsAction.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/subawardReporting/printing/service/impl/SubAwardPrintingServiceImpl.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/subawardReporting/printing/xmlstream/SubAwardFDPPrintXmlStream.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/timeandmoney/transactions/TransactionRuleImpl.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/web/filter/PerformanceLoggingFilter.java.patch\n\ncx_patches/src/main/java/org/kuali/kra/web/struts/action/KraTransactionalDocumentActionBase.java.patch\n\ncx_patches/src/main/resources/ApplicationResources.properties.patch\n\ncx_patches/src/main/resources/org/kuali/kra/CoreSpringBeans.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/Award.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/AwardPerson.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/Budget.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/CustReportDetails.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/CustReportType.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/CustRptDefaultParms.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/CustRptTypeDocument.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/DevelopmentProposal.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/docs/RolodexMaintenanceDocument.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/docs/SponsorMaintenanceDocument.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/IacucProtocol.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/InstitutionalProposal.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/InstitutionalProposalPerson.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/LookupableDevelopmentProposal.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/Negotiation.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/NegotiationActivity.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/NegotiationUnassociatedDetail.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/ProposalDevelopmentDocument.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/Protocol.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/Rolodex.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/Sponsor.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/SponsorSpecial.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/SubAward.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/SubAwardCopyRightsType.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/SubAwardCostType.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/datadictionary/SubAwardFundingSource.xml.patch\n\ncx_patches/src/main/resources/org/kuali/kra/printing/stylesheet/AwardNotice.xsl.patch\n\ncx_patches/src/main/resources/org/kuali/kra/printing/stylesheet/BudgetSummaryTotalPage.xsl.patch\n\ncx_patches/src/main/resources/org/kuali/kra/printing/stylesheet/FDP_Modification_Template.xsl.patch\n\ncx_patches/src/main/resources/org/kuali/kra/printing/stylesheet/FDP_Template_Agreement.xsl.patch\n\ncx_patches/src/main/resources/org/kuali/kra/RiceOverridesSpringBeans.xml.patch\n\ncx_patches/src/main/resources/repository.xml.patch\n\nbegin phase 2 of CX merges\n\ncx_patches/src/main/config/sql/RELEASE-SCRIPTS/KC_Install.sh.patch pass 2\n\ncx_patches/src/main/java/com/rsmart/kuali/kra/workflow/UnitAdministratorRoleAttribute.java.patch\n\nupdated CX_PORTING for files that cannot be found in pass 2\n\nupdated CX_PORTING after pass 2 TODO inspection\n\n[ERROR] /Develop/Kuali/svn_kuali_org_kc/coeus-impl/src/main/java/org/kuali/coeus/common/notification/impl/service/impl/KcNotificationServiceImpl.java:[451,16] error: 'catch' without 'try'\n\n[ERROR] /Develop/Kuali/svn_kuali_org_kc/coeus-impl/src/main/java/org/kuali/coeus/common/framework/person/KcPerson.java:[75,29] error: variable LOG is already defined in class KcPerson\n\nRevert \"cx_patches/src/main/java/org/kuali/kra/award/web/struts/action/AwardActionsAction.java.patch\"\n\nThis reverts commit 6602461f15248817d029d055c62b9d694677941d.\n\nConflicts:\n\tCX_PORTING.md\n\nrevert changes to cx_patches/src/main/java/org/kuali/kra/award/web/struts/action/AwardActionsAction.java.patch and update CX_PORTING\n\nFixed: AuthTokenGenerator cannot be resolved to a type\n\nFixed: Duplicate field CoiMessagesServiceImpl.LOG\n\nFixed: ProposalPerson cannot be resolved to a type\n\nUpdated object references for com/rsmart/kuali/kra/workflow/UnitAdministratorRoleAttribute.java. A couple of errors remain that need attention\n\nFixed: The import org.kuali.kra.bo.Unit cannot be resolved\n\nFixed: Unit cannot be resolved to a type\n\nRevert \"cx_patches/src/main/java/org/kuali/kra/bo/RolodexMaintainableImpl.java.patch\"\n\nThis reverts commit 3aa4c838aae72ce5f0173761a980fa146db83967.\n\nConflicts:\n\tCX_PORTING.md\n\n[ERROR] /Develop/Kuali/svn_kuali_org_kc/coeus-impl/src/main/java/com/rsmart/kuali/kra/workflow/UnitAdministratorRoleAttribute.java:[111,130] error: cannot find symbol\n[ERROR] symbol:   method getUnitAdministratorTypeCode()\n[ERROR] location: class UnitAdministratorType\n[ERROR] /Develop/Kuali/svn_kuali_org_kc/coeus-impl/src/main/java/com/rsmart/kuali/kra/workflow/UnitAdministratorRoleAttribute.java:[128,135] error: cannot find symbol\n\nCX 6 now compiles! w00t! Next bind to our fork of rice\n\nbind to CX rice version 2.5.2.0-kualico-SNAPSHOT\n\nFixes: Caused by: java.lang.ClassNotFoundException: com.rsmart.kuali.coeus.data.migration.FlywayMigrator\n\nvery close to getting CX6 to start\n\nDisable HR REST API until we can resolve: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'hrImportService' defined in class path resource [com/rsmart/kuali/coeus/hr/JerseyBeans.xml]: Instantiation of bean failed; nested exception is org.springframework.beans.BeanInstantiationException: Could not instantiate bean class [com.rsmart.kuali.coeus.hr.service.impl.HRImportServiceImpl]: Constructor threw exception; nested exception is java.lang.NoClassDefFoundError: org/kuali/kra/bo/PersonAppointment\n\nFixes ERROR 1064 (42000) at line 17: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '--creates additional attribute for krms data validation rules\n\nAdded a quick hack to apply KC6 upgrade SQL/DML\n\nupdated CX_PORTING with new SQL error info\n\nFixes dml/KC_DML_02_KCINFR-979_B000.sql error\n\nErronous duplicate entry in mysql file\n\nupdated CX_PORTING.md for REST API progress\n\nadded todo for REST API spring context errors\n\nManually merged PD authorizer changes into PDDocAuthorizer\n\nMerged in changes to KcAuthorizationBase and KcTransDocActionBase\n\nresolved REST API startup issue\n\nAwardActionsAction merged and other files confirmed\n\nRelevant changes from patch applied to Rolodex.java\n\nS2SUtil patch changes being applied upstream in KC","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/1ae2630486ac0ef911c1ffa8127b9e15ae60d1ce"},{"sha":"af713a3c60c7b2ab3c738854ddcd08d1ad16f000","author":{"email":"3161cdc7bf197e4c3a35b9cbe358c79910f27e90@speelmon.com","name":"Lance Speelmon"},"message":"CX Reporting Framework\n\ncx_patches/src/main/webapp/WEB-INF/struts-config.xml.patch\n\ncx_patches/src/main/webapp/WEB-INF/web.xml.patch\n\ncx_patches/src/main/java/com/rsmart/kuali/kra/reporting/web/struts/action/ReportForwardAction.java.patch\n\ncx_patches/src/main/java/com/rsmart/kuali/kra/reporting/web/struts/form/ReportFormwardForm.java.patch","distinct":false,"url":"https://api.github.com/repos/jwillia/kc/commits/af713a3c60c7b2ab3c738854ddcd08d1ad16f000"}]}