diff options
Diffstat (limited to 'bundles/org.eclipse.wst.ws/jmerger/merge.xml')
| -rw-r--r-- | bundles/org.eclipse.wst.ws/jmerger/merge.xml | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/bundles/org.eclipse.wst.ws/jmerger/merge.xml b/bundles/org.eclipse.wst.ws/jmerger/merge.xml deleted file mode 100644 index 31e2134bd..000000000 --- a/bundles/org.eclipse.wst.ws/jmerger/merge.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Merge rules used by JMerger --> -<merge:options - xmlns:merge="http://www.eclipse.org/org/eclipse/emf/codegen/jmerge/Options"> - <merge:pull - sourceGet="Method/getReturnType" - targetPut="Method/setReturnType"/> - <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> |