diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:07:37 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:07:37 +0000 |
commit | 9f395ebf3ec27f89c8dc63137bc99c8d6b0cff6d (patch) | |
tree | 34231d72966aa918e80eea15602b6870d8b21641 /sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main | |
parent | 07b7dfd1a70ba222b899d9813f8c449dbf3b785f (diff) |
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835125 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/CompositeClient.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/composite/CompositeClient.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/Source.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/composite/Source.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceCallback.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceCallback.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceImpl.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/Target.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/composite/Target.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/TargetImpl.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/composite/TargetImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/foo/A.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/foo/A.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/foo/B.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/foo/B.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/foo/I.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/foo/I.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentAImpl.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentAImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentCImpl.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentCImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentEImpl.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentEImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentFImpl.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentFImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/Service1.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/sample/Service1.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/Aggregator.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/test/Aggregator.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/AggregatorImpl.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/test/AggregatorImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/InnerSourceImpl.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/test/InnerSourceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/OuterSourceImpl.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/test/OuterSourceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/Source.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/test/Source.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/Target.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/Target.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetOne.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetOne.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetTwo.java (renamed from branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetTwo.java) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/AComposite.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/AComposite.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/BComposite.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/BComposite.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/CComposite.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/CComposite.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite1.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/Composite1.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite2.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/Composite2.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite3.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/Composite3.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Inner.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/Inner.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite2.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite2.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Outer.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/Outer.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/OuterComposite.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/OuterComposite.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/foo.png (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/foo/foo.png) | bin | 571816 -> 571816 bytes | |||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o1.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o1.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o2.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o2.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o3.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o3.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o4.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o4.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/test1/InnerComposite.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/test1/InnerComposite.composite) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/test1/OuterComposite.composite (renamed from branches/sca-java-1.2/itest/recursive/src/main/resources/test1/OuterComposite.composite) | 0 |
41 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/CompositeClient.java index 5edc305970..5edc305970 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/CompositeClient.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/CompositeClient.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/Source.java index d0efcc1df1..d0efcc1df1 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/Source.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/Source.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceCallback.java index baa95a8e39..baa95a8e39 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceCallback.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceCallback.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceImpl.java index b9a0c7ff74..b9a0c7ff74 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/SourceImpl.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/Target.java index 9a8f68a7fa..9a8f68a7fa 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/Target.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/Target.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/TargetImpl.java index 86686e9233..86686e9233 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/composite/TargetImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/composite/TargetImpl.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/foo/A.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/foo/A.java index e87cbde26d..e87cbde26d 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/foo/A.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/foo/A.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/foo/B.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/foo/B.java index 9d060cab59..9d060cab59 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/foo/B.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/foo/B.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/foo/I.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/foo/I.java index f6d55baef3..f6d55baef3 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/foo/I.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/foo/I.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentAImpl.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentAImpl.java index f513949105..f513949105 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentAImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentAImpl.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentCImpl.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentCImpl.java index 586a9ee6a7..586a9ee6a7 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentCImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentCImpl.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentEImpl.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentEImpl.java index dbf2735aa7..dbf2735aa7 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentEImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentEImpl.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentFImpl.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentFImpl.java index 5e136e536c..5e136e536c 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentFImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/ComponentFImpl.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/sample/Service1.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/Service1.java index 81bdce79f1..81bdce79f1 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/sample/Service1.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/sample/Service1.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/test/Aggregator.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/Aggregator.java index 88b3bed1b2..88b3bed1b2 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/test/Aggregator.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/Aggregator.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/test/AggregatorImpl.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/AggregatorImpl.java index f6ac6c8741..f6ac6c8741 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/test/AggregatorImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/AggregatorImpl.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/test/InnerSourceImpl.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/InnerSourceImpl.java index c8dad5ae35..c8dad5ae35 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/test/InnerSourceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/InnerSourceImpl.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/test/OuterSourceImpl.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/OuterSourceImpl.java index 11816e82cf..11816e82cf 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/test/OuterSourceImpl.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/OuterSourceImpl.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/test/Source.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/Source.java index 9b93740d9d..9b93740d9d 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/test/Source.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test/Source.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/Target.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/Target.java index 4883e12f49..4883e12f49 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/Target.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/Target.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetOne.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetOne.java index a7c68f4ffd..a7c68f4ffd 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetOne.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetOne.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetTwo.java index 7fff8e2e9b..7fff8e2e9b 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetTwo.java +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/java/test1/composite/TargetTwo.java diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/AComposite.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/AComposite.composite index 1b5dee8762..1b5dee8762 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/AComposite.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/AComposite.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/BComposite.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/BComposite.composite index 7d4588eba4..7d4588eba4 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/BComposite.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/BComposite.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/CComposite.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/CComposite.composite index 6d7b4ec600..6d7b4ec600 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/CComposite.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/CComposite.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite1.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite1.composite index 56fd7c621f..56fd7c621f 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite1.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite1.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite2.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite2.composite index 54f10673a4..54f10673a4 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite2.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite2.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite3.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite3.composite index 040653493f..040653493f 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite3.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Composite3.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/Inner.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Inner.composite index 398ebdf6e2..398ebdf6e2 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/Inner.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Inner.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite.composite index 3376ac8ff5..3376ac8ff5 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite2.composite index c9eff4fa9d..c9eff4fa9d 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite2.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/InnerComposite2.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/META-INF/sca-contribution.xml index 966f977dea..966f977dea 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/META-INF/sca-contribution.xml diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/Outer.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Outer.composite index 987990d854..987990d854 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/Outer.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/Outer.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/OuterComposite.composite index cb1c1e13d4..cb1c1e13d4 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/OuterComposite.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/OuterComposite.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/foo.png b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/foo.png Binary files differindex 0f2ec78aaf..0f2ec78aaf 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/foo.png +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/foo.png diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o1.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o1.composite index 1d31c2f424..1d31c2f424 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o1.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o1.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o2.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o2.composite index 4f21c21860..4f21c21860 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o2.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o2.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o3.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o3.composite index 72c732c03e..72c732c03e 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o3.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o3.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o4.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o4.composite index f8f07eed09..f8f07eed09 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o4.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/foo/o4.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/test1/InnerComposite.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/test1/InnerComposite.composite index 177fa10550..177fa10550 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/test1/InnerComposite.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/test1/InnerComposite.composite diff --git a/branches/sca-java-1.2/itest/recursive/src/main/resources/test1/OuterComposite.composite b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/test1/OuterComposite.composite index d05a67f45f..d05a67f45f 100644 --- a/branches/sca-java-1.2/itest/recursive/src/main/resources/test1/OuterComposite.composite +++ b/sca-java-1.x/branches/sca-java-1.2/itest/recursive/src/main/resources/test1/OuterComposite.composite |