| Summary: | Enhance CDO Offline example | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | [Modeling] EMF | Reporter: | Martin Fluegge <martin.fluegge> | ||||||||||
| Component: | cdo.core | Assignee: | Martin Fluegge <martin.fluegge> | ||||||||||
| Status: | CLOSED FIXED | QA Contact: | Eike Stepper <stepper> | ||||||||||
| Severity: | enhancement | ||||||||||||
| Priority: | P3 | CC: | lu.xingxiao | ||||||||||
| Version: | 4.2 | Flags: | stepper:
review+
|
||||||||||
| Target Milestone: | --- | ||||||||||||
| Hardware: | PC | ||||||||||||
| OS: | Windows XP | ||||||||||||
| Whiteboard: | Appealing to a Broader Community | ||||||||||||
| Bug Depends on: | 346792 | ||||||||||||
| Bug Blocks: | |||||||||||||
| Attachments: |
|
||||||||||||
|
Description
Martin Fluegge
Created attachment 188678 [details]
patch v1
I attached a patch which splits up the iniital file. I also wrote an offline merge example which should be integrated into the separated implementation. Unfortunately I can't get the clone running. After startup it runs into a Oflline/Syncing loop which makes me feel that there is something wrong with the connection to the master or with the repository synchronizer.
The problem is that I can't even get the original example running, so this might be a new common problem in the offline mode. (three days ago it worked)
Eike, could you please try the examples and tell me whether they work on your machine?
(In reply to comment #1) > I attached a patch which splits up the iniital file. I also wrote an offline > merge example which should be integrated into the separated implementation. > Unfortunately I can't get the clone running. After startup it runs into a > Oflline/Syncing loop which makes me feel that there is something wrong with the > connection to the master or with the repository synchronizer. With the new LongIDHandler I introduced a bug. An OMMonitor was forked() twice and complained about missing begin() on the second call. I fixed it. It seeme that there's one more problem with ExternalReferenceManager.rawImport(). Investigating... > It seeme that there's one more problem with
> ExternalReferenceManager.rawImport(). Investigating...
I fixed replication of extRef data!
Created attachment 188876 [details]
Patch v2
Now it works ;)
I enhanced it a bit and included merging the the client site.
Run the client with "-automerge" will start the session listener wit an automatic merge functionality after the master is only again. The changes will be merged, committed and the clone switches back to the main branch. :)
Patch v1 has not been obsoleted and patch v2 is not workspace-relative ;-( Darn. I'll fix this asap. Sorry. Did it already! Can OfflineExampleMaster.showMenu() be removed? It's never called... Created attachment 189475 [details]
Patch v3
Is this expected to replace the original OfflineExample?
> Can OfflineExampleMaster.showMenu() be removed? It's never called... Yepp. >Is this expected to replace the original OfflineExample? Yepp. Committed revision 7174 Shall I remove the old example? We need to provide a small menus which shows all available switched for the client (e.g. enableMerging) and we should store the current branch of the clone the make it resistant against clone restarts. Created attachment 196272 [details] Patch v4 I added a small menu for the client which describes the possible configurations. But due to bug 346792 I had to stop working on this ;( (In reply to comment #12) > Shall I remove the old example? I'll do it now ;-) Committed revision 7961 Moving all open enhancement requests to 4.1 Moving all open issues to 4.2. Open bugs can be ported to 4.1 maintenance after they've been fixed in master. Patch v4 hasn't been committed but the original problem has been solved. Available in R20130613-1157 (4.2) |