making equivalent rearrangements in trunk as those that were done in the 1.1 branch in commit 640209

git-svn-id: https://svn.apache.org/repos/asf/tuscany/java/sdo@680348 13f79535-47bb-0310-9956-ffa450edef68
10 files changed