diff options
| author | kchan | 2007-08-15 18:01:57 +0000 |
|---|---|---|
| committer | kchan | 2007-08-15 18:01:57 +0000 |
| commit | 21bb02835f0ab847bb7b5fdb56f25edffb898afa (patch) | |
| tree | df67889dda0a0c9c75ac1d2fdc5b794ae98abab9 | |
| parent | 2ec9666d12ba3e23716ed094b2724b8b0dc782c8 (diff) | |
| download | webtools.webservices-21bb02835f0ab847bb7b5fdb56f25edffb898afa.tar.gz webtools.webservices-21bb02835f0ab847bb7b5fdb56f25edffb898afa.tar.xz webtools.webservices-21bb02835f0ab847bb7b5fdb56f25edffb898afa.zip | |
[180265] Skeleton merge should take annotation into account.
| -rw-r--r-- | bundles/org.eclipse.wst.ws/jmerger/merge.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/bundles/org.eclipse.wst.ws/jmerger/merge.xml b/bundles/org.eclipse.wst.ws/jmerger/merge.xml index 34d32b8bd..31e2134bd 100644 --- a/bundles/org.eclipse.wst.ws/jmerger/merge.xml +++ b/bundles/org.eclipse.wst.ws/jmerger/merge.xml @@ -8,4 +8,19 @@ <merge:pull sourceGet="Method/getExceptions" targetPut="Method/addException"/> + +<!-- Merge rules to handle annotation: + - With this pull rule, annotations in the target is replaced by annotations of the + same name in the source. + - With this sweep rule, any annotation in the target that is not available in the + source is commented out. + - By default, any annotation in the source that is not in the target are pulled into the target. +--> + + <merge:pull + sourceGet="Annotation/getContents" + targetPut="Annotation/setContents"/> + + <merge:sweep select="Annotation" action="comment"/> + </merge:options> |