[jira] Commented: (OFBIZ-552) Integration Shark 1.1_2 into OfBiz
Locked
[jira] Commented: (OFBIZ-552) Integration Shark 1.1_2 into OfBiz
 
|
[ https://issues.apache.org/jira/browse/OFBIZ-552?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12466334 ] Jacques Le Roux commented on OFBIZ-552: --------------------------------------- Sergey, I rewieved your patch, some comments. I changed all tabs to 4 spaces, that's our policy please see http://docs.ofbiz.org/display/OFBADMIN/OFBiz+Contributors+Best+Practices and specially http://docs.ofbiz.org/display/OFBADMIN/Coding+Conventions Notably, please note that patches should be done from root and not framework. So your patch is to be applied from framework. I will not commit your changes to framework/base/config/jetty-containers.xml framework/base/config/ofbiz-containers.xml framework/base/config/test-containers.xml framework/build.xml framework/component-load.xml because they have been commented out for legal reasons (see OPTIONAL_LIBRARIES file please). But I agree that this might usefull for testing; specially if the pathes were changed from base/... to framework/base/... And sorry, because I ask you for shark versionned jar file but this is not really needed as this files will not be incorporated in the trunk (see OPTIONAL_LIBRARIES). Inshark/src/org/enhydra/shark/ThreadedToolAgentManager.java, are the lines +//import org.enhydra.jawe.xml.elements.Implementation; +//import org.enhydra.jawe.xml.elements.Tools; really needed ? The header you added is wrong, Index: shark/src/org/ofbiz/shark/SharkConstants.java =================================================================== --- shark/src/org/ofbiz/shark/SharkConstants.java (revision 0) +++ shark/src/org/ofbiz/shark/SharkConstants.java (revision 0) @@ -0,0 +1,142 @@ +/* + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ it has recently changed. Please read my comment above https://issues.apache.org/jira/browse/OFBIZ-552#action_12466240 Here is the patching result : patching file base/config/jetty-containers.xml patching file base/config/ofbiz-containers.xml patching file base/config/test-containers.xml patching file build.xml patching file component-load.xml patching file entity/fieldtype/fieldtypederby.xml patching file shark/build.xml patching file shark/entitydef/entitymodel.xml patching file shark/src/org/enhydra/shark/ThreadedToolAgentManager.java Hunk #1 succeeded at 18 with fuzz 1 (offset 3 lines). patching file shark/src/org/ofbiz/shark/audit/AssignmentEventAudit.java Hunk #1 succeeded at 28 (offset 3 lines). patching file shark/src/org/ofbiz/shark/audit/CreateProcessEventAudit.java Hunk #1 succeeded at 51 (offset 3 lines). Hunk #2 succeeded at 155 (offset 3 lines). patching file shark/src/org/ofbiz/shark/audit/DataEventAudit.java Hunk #1 succeeded at 46 (offset 3 lines). Hunk #2 succeeded at 58 (offset 3 lines). Hunk #3 succeeded at 81 (offset 3 lines). Hunk #4 succeeded at 182 (offset 3 lines). patching file shark/src/org/ofbiz/shark/audit/EntityAuditMgr.java Hunk #1 succeeded at 38 (offset 3 lines). Hunk #2 succeeded at 171 (offset 3 lines). Hunk #3 succeeded at 181 (offset 3 lines). Hunk #4 succeeded at 194 (offset 3 lines). Hunk #5 succeeded at 204 (offset 3 lines). Hunk #6 succeeded at 217 (offset 3 lines). Hunk #7 succeeded at 227 (offset 3 lines). Hunk #8 succeeded at 241 (offset 3 lines). Hunk #9 succeeded at 251 (offset 3 lines). Hunk #10 succeeded at 264 (offset 3 lines). Hunk #11 succeeded at 274 (offset 3 lines). Hunk #12 succeeded at 287 (offset 3 lines). Hunk #13 succeeded at 297 (offset 3 lines). patching file shark/src/org/ofbiz/shark/audit/EventAudit.java Hunk #1 succeeded at 42 (offset 3 lines). Hunk #2 succeeded at 54 (offset 3 lines). patching file shark/src/org/ofbiz/shark/audit/StateEventAudit.java Hunk #1 succeeded at 39 (offset 3 lines). Hunk #2 succeeded at 51 (offset 3 lines). patching file shark/src/org/ofbiz/shark/auth/GenericAuthenticationMgr.java Hunk #1 succeeded at 23 (offset 3 lines). Hunk #2 succeeded at 45 (offset 3 lines). patching file shark/src/org/ofbiz/shark/auth/OfbizAuthenticationMgr.java Hunk #1 succeeded at 20 (offset 3 lines). Hunk #2 succeeded at 49 (offset 3 lines). patching file shark/src/org/ofbiz/shark/container/SharkContainer.java Hunk #1 succeeded at 19 (offset 3 lines). Hunk #2 succeeded at 70 (offset 3 lines). Hunk #3 succeeded at 131 (offset 3 lines). Hunk #4 succeeded at 158 (offset 3 lines). patching file shark/src/org/ofbiz/shark/expression/ActivityIteratorCondExprBldr.java Hunk #1 succeeded at 22 (offset 3 lines). Hunk #2 succeeded at 65 (offset 3 lines). Hunk #3 succeeded at 93 (offset 3 lines). Hunk #4 succeeded at 196 (offset 3 lines). Hunk #5 succeeded at 292 (offset 3 lines). patching file shark/src/org/ofbiz/shark/expression/AssignmentIteratorCondExprBldr.java Hunk #1 succeeded at 19 (offset 3 lines). Hunk #2 succeeded at 49 (offset 3 lines). patching file shark/src/org/ofbiz/shark/expression/ProcessIteratorCondExprBldr.java Hunk #1 succeeded at 20 (offset 3 lines). patching file shark/src/org/ofbiz/shark/expression/ProcessMgrIteratorCondExprBldr.java Hunk #1 succeeded at 19 (offset 3 lines). Hunk #2 succeeded at 51 (offset 3 lines). Hunk #3 succeeded at 92 (offset 3 lines). patching file shark/src/org/ofbiz/shark/expression/ResourceIteratorCondExprBldr.java Hunk #1 succeeded at 19 (offset 3 lines). patching file shark/src/org/ofbiz/shark/instance/Activity.java Hunk #1 succeeded at 43 (offset 3 lines). Hunk #2 succeeded at 60 (offset 3 lines). Hunk #3 succeeded at 87 (offset 3 lines). Hunk #4 succeeded at 229 (offset 3 lines). patching file shark/src/org/ofbiz/shark/instance/ActivityVariable.java Hunk #1 succeeded at 32 (offset 3 lines). Hunk #2 succeeded at 45 (offset 3 lines). Hunk #3 succeeded at 62 (offset 3 lines). Hunk #4 succeeded at 90 (offset 3 lines). Hunk #5 succeeded at 134 (offset 3 lines). patching file shark/src/org/ofbiz/shark/instance/AndJoinEntry.java Hunk #1 succeeded at 30 (offset 3 lines). Hunk #2 succeeded at 42 (offset 3 lines). Hunk #3 succeeded at 59 (offset 3 lines). Hunk #4 succeeded at 86 (offset 3 lines). patching file shark/src/org/ofbiz/shark/instance/Assignment.java Hunk #1 succeeded at 30 (offset 3 lines). Hunk #2 succeeded at 42 (offset 3 lines). Hunk #3 succeeded at 59 (offset 3 lines). Hunk #4 succeeded at 87 (offset 3 lines). Hunk #5 succeeded at 103 (offset 3 lines). Hunk #6 succeeded at 154 (offset 3 lines). patching file shark/src/org/ofbiz/shark/instance/Deadline.java Hunk #1 succeeded at 18 with fuzz 1 (offset 3 lines). Hunk #2 succeeded at 44 (offset 3 lines). Hunk #3 succeeded at 61 (offset 3 lines). Hunk #4 succeeded at 88 (offset 3 lines). patching file shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java Hunk #1 FAILED at 13. Hunk #2 succeeded at 203 (offset 3 lines). Hunk #3 succeeded at 214 (offset 3 lines). Hunk #4 succeeded at 224 (offset 3 lines). Hunk #5 succeeded at 286 (offset 3 lines). Hunk #6 succeeded at 296 (offset 3 lines). Hunk #7 succeeded at 305 (offset 3 lines). Hunk #8 succeeded at 357 (offset 3 lines). Hunk #9 succeeded at 369 (offset 3 lines). Hunk #10 succeeded at 387 (offset 3 lines). Hunk #11 succeeded at 407 (offset 3 lines). Hunk #12 succeeded at 420 (offset 3 lines). Hunk #13 succeeded at 451 (offset 3 lines). Hunk #14 succeeded at 474 (offset 3 lines). Hunk #15 succeeded at 494 (offset 3 lines). Hunk #16 succeeded at 537 (offset 3 lines). Hunk #17 succeeded at 551 (offset 3 lines). Hunk #18 succeeded at 623 (offset 3 lines). Hunk #19 succeeded at 647 (offset 3 lines). Hunk #20 succeeded at 664 (offset 3 lines). Hunk #21 succeeded at 676 (offset 3 lines). Hunk #22 succeeded at 686 (offset 3 lines). Hunk #23 succeeded at 701 (offset 3 lines). Hunk #24 succeeded at 723 (offset 3 lines). Hunk #25 succeeded at 741 (offset 3 lines). Hunk #26 succeeded at 768 (offset 3 lines). Hunk #27 succeeded at 786 (offset 3 lines). Hunk #28 succeeded at 801 (offset 3 lines). Hunk #29 succeeded at 824 (offset 3 lines). Hunk #30 succeeded at 858 (offset 3 lines). Hunk #31 succeeded at 876 (offset 3 lines). Hunk #32 succeeded at 899 (offset 3 lines). Hunk #33 succeeded at 944 (offset 3 lines). 1 out of 33 hunks FAILED -- saving rejects to file shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java.rej patching file shark/src/org/ofbiz/shark/instance/Process.java Hunk #1 succeeded at 18 with fuzz 1 (offset 3 lines). Hunk #2 succeeded at 47 (offset 3 lines). Hunk #3 succeeded at 66 (offset 3 lines). Hunk #4 succeeded at 85 (offset 3 lines). Hunk #5 succeeded at 96 (offset 3 lines). Hunk #6 succeeded at 233 (offset 3 lines). patching file shark/src/org/ofbiz/shark/instance/ProcessMgr.java Hunk #1 succeeded at 33 (offset 3 lines). Hunk #2 succeeded at 41 (offset 3 lines). Hunk #3 succeeded at 58 (offset 3 lines). Hunk #4 succeeded at 85 (offset 3 lines). Hunk #5 succeeded at 135 (offset 3 lines). Hunk #6 succeeded at 147 (offset 3 lines). patching file shark/src/org/ofbiz/shark/instance/ProcessVariable.java Hunk #1 succeeded at 31 (offset 3 lines). Hunk #2 succeeded at 43 (offset 3 lines). Hunk #3 succeeded at 60 (offset 3 lines). Hunk #4 succeeded at 88 (offset 3 lines). patching file shark/src/org/ofbiz/shark/instance/Resource.java Hunk #1 succeeded at 30 (offset 3 lines). Hunk #2 succeeded at 42 (offset 3 lines). Hunk #3 succeeded at 59 (offset 3 lines). Hunk #4 succeeded at 86 (offset 3 lines). Hunk #5 succeeded at 123 (offset 3 lines). patching file shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java Hunk #1 succeeded at 35 (offset 3 lines). Hunk #2 succeeded at 80 (offset 3 lines). Hunk #3 succeeded at 128 (offset 3 lines). Hunk #4 succeeded at 162 (offset 3 lines). patching file shark/src/org/ofbiz/shark/mapping/EntityApplicationMappingMgr.java Hunk #1 succeeded at 38 (offset 3 lines). Hunk #2 succeeded at 66 (offset 3 lines). patching file shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java Hunk #1 succeeded at 31 (offset 3 lines). Hunk #2 succeeded at 43 (offset 3 lines). Hunk #3 succeeded at 58 (offset 3 lines). Hunk #4 succeeded at 85 (offset 3 lines). patching file shark/src/org/ofbiz/shark/mapping/EntityParticipantMappingMgr.java Hunk #1 succeeded at 39 (offset 3 lines). Hunk #2 succeeded at 55 (offset 3 lines). Hunk #3 succeeded at 64 (offset 3 lines). Hunk #4 succeeded at 97 (offset 3 lines). Hunk #5 succeeded at 118 (offset 3 lines). patching file shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java Hunk #1 succeeded at 18 with fuzz 1 (offset 3 lines). Hunk #2 succeeded at 74 (offset 3 lines). Hunk #3 succeeded at 88 (offset 3 lines). Hunk #4 succeeded at 115 (offset 3 lines). Hunk #5 succeeded at 146 (offset 3 lines). Hunk #6 succeeded at 156 (offset 3 lines). Hunk #7 succeeded at 196 (offset 3 lines). Hunk #8 succeeded at 205 (offset 3 lines). Hunk #9 succeeded at 220 (offset 3 lines). Hunk #10 succeeded at 232 (offset 3 lines). Hunk #11 succeeded at 240 (offset 3 lines). Hunk #12 succeeded at 252 (offset 3 lines). Hunk #13 succeeded at 281 (offset 3 lines). Hunk #14 succeeded at 296 (offset 3 lines). patching file shark/src/org/ofbiz/shark/requester/AbstractRequester.java Hunk #1 succeeded at 122 (offset 3 lines). Hunk #2 succeeded at 211 (offset 3 lines). Hunk #3 succeeded at 224 (offset 3 lines). patching file shark/src/org/ofbiz/shark/requester/LoggingRequester.java Hunk #1 succeeded at 31 (offset 3 lines). Hunk #2 succeeded at 62 (offset 3 lines). patching file shark/src/org/ofbiz/shark/requester/ServiceRequester.java Hunk #1 FAILED at 1. Hunk #2 FAILED at 12. Hunk #3 succeeded at 33 (offset 3 lines). Hunk #4 succeeded at 63 (offset 3 lines). Hunk #5 succeeded at 75 (offset 3 lines). 2 out of 5 hunks FAILED -- saving rejects to file shark/src/org/ofbiz/shark/requester/ServiceRequester.java.rej patching file shark/src/org/ofbiz/shark/SharkConstants.java patching file shark/src/org/ofbiz/shark/tool/ServiceEngineAgent.java Hunk #1 succeeded at 34 (offset 3 lines). Hunk #2 succeeded at 49 (offset 3 lines). Hunk #3 succeeded at 77 (offset 3 lines). Hunk #4 succeeded at 93 (offset 3 lines). patching file shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java Hunk #1 succeeded at 52 (offset 3 lines). Hunk #2 succeeded at 61 (offset 3 lines). Hunk #3 succeeded at 72 (offset 3 lines). Hunk #4 succeeded at 81 (offset 3 lines). Hunk #5 succeeded at 92 (offset 3 lines). Hunk #6 succeeded at 101 (offset 3 lines). Hunk #7 succeeded at 128 (offset 3 lines). Hunk #8 succeeded at 161 (offset 3 lines). Hunk #9 succeeded at 203 (offset 3 lines). Hunk #10 succeeded at 215 (offset 3 lines). Hunk #11 succeeded at 239 (offset 3 lines). Hunk #12 succeeded at 254 (offset 3 lines). Hunk #13 succeeded at 299 (offset 3 lines). Hunk #14 succeeded at 319 (offset 3 lines). Hunk #15 succeeded at 354 (offset 3 lines). Hunk #16 succeeded at 367 (offset 3 lines). Hunk #17 succeeded at 402 (offset 3 lines). Hunk #18 succeeded at 414 (offset 3 lines). Hunk #19 succeeded at 426 (offset 3 lines). Hunk #20 succeeded at 438 (offset 3 lines). Hunk #21 succeeded at 446 (offset 3 lines). patching file shark/src/org/ofbiz/shark/user/PartyUserGroupMgr.java Hunk #1 succeeded at 26 (offset 3 lines). Hunk #2 succeeded at 45 (offset 3 lines). Hunk #3 succeeded at 70 (offset 3 lines). Hunk #4 succeeded at 108 (offset 3 lines). Hunk #5 succeeded at 158 (offset 3 lines). patching file shark/webapp/shark/process/processDetailList.ftl patching file shark/webapp/shark/process/processHistory.ftl patching file shark/webapp/shark/process/processList.ftl patching file shark/webapp/shark/WEB-INF/actions/process/processDetailList.bsh patching file shark/webapp/shark/WEB-INF/actions/process/processHistory.bsh patching file shark/webapp/shark/WEB-INF/actions/process/processList.bsh patching file shark/webapp/shark/WEB-INF/actions/repository/showRepository.bsh patching file shark/webapp/shark/WEB-INF/actions/tasklist/worklist.bsh A few hunks failed ServiceRequester.java is easy to change by hand, simply add import org.enhydra.shark.api.SharkTransaction; import org.enhydra.shark.api.client.wfbase.BaseException; import org.enhydra.shark.api.client.wfmodel.InvalidPerformer; import org.enhydra.shark.api.client.wfmodel.WfEventAudit; and neglict licence hunks issues (already OK) EntityPersistentMgr.java 1st hunk is easily resolved by merging. I post the original patch without tabs and the EntityPersistentMgr.java 1st hunk in patch which is to be resolved by merge. Compilation was ok. Congratulations, good work ! Thanks > Integration Shark 1.1_2 into OfBiz > ---------------------------------- > > Key: OFBIZ-552 > URL: https://issues.apache.org/jira/browse/OFBIZ-552 > Project: Apache OFBiz (The Open for Business Project) > Issue Type: New Feature > Components: framework > Reporter: Sergey Shutov > Assigned To: Jacques Le Roux > Attachments: shark_2.diff, versioned_shark_jars.zip > > -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: https://issues.apache.org/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |