diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-16 08:44:44 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-16 08:44:44 +0000 |
commit | 3d3b8834b93b98cc7d7534e693e937179067eb58 (patch) | |
tree | 1c31b939872ea8455118a16009a2abb96179ecf1 /branches/sca-java-1.5/vtest/assembly/ctypefile | |
parent | 86101a456fb21b25abc09533769805911efd1c7f (diff) |
Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775435 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
18 files changed, 0 insertions, 756 deletions
diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/pom.xml b/branches/sca-java-1.5/vtest/assembly/ctypefile/pom.xml deleted file mode 100644 index 6b665fdb18..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>vtest-assembly</artifactId> - <version>1.5-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>vtest-assembly-ctypefile</artifactId> - - <name>Apache Tuscany SCA vTest SCA Assembly Verification Tests - Component Type File</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.5-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.5-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - - -</project> diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java deleted file mode 100644 index d1df390ace..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.vtest.assembly.ctypefile; - -/** - * Simple Remotable Service - */ -public interface AService { - - public String getState(); - public String getState2(); - public String getBProperty(); - -} diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java deleted file mode 100644 index 8ee18b242f..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.vtest.assembly.ctypefile; - -/** - * Simple Service - */ -public interface BService { - - public String getState(); - public String getSomeProperty(); - -} diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java deleted file mode 100644 index 3664d67299..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.vtest.assembly.ctypefile; - -/** - * Simple Remotable Service - */ -public interface CService { - - public String getState(); - public String getSomeProperty(); - -} diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java deleted file mode 100644 index 0d2dcb580b..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.vtest.assembly.ctypefile; - -/** - * Simple Remotable Service - */ -public interface DService { - - public String getState(); - public String getSomeProperty(); - -} diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java deleted file mode 100644 index 0f24201970..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.vtest.assembly.ctypefile.impl; - -import org.apache.tuscany.sca.vtest.assembly.ctypefile.AService; -import org.apache.tuscany.sca.vtest.assembly.ctypefile.BService; -import org.osoa.sca.annotations.Reference; - -public class AServiceImpl implements AService { - - private BService bService; - private BService b2Service; - - public void setBService(BService b) { - this.bService = b; - } - - @Reference - public void setB2Service(BService b) { - this.b2Service = b; - } - - public String getState() { - return bService.getState(); - } - - public String getState2() { - return b2Service.getState(); - } - - public String getBProperty() { - return bService.getSomeProperty(); - } - -} - diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java deleted file mode 100644 index fd32cb1f9b..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.vtest.assembly.ctypefile.impl; - -import org.apache.tuscany.sca.vtest.assembly.ctypefile.BService; - -public class BServiceImpl implements BService { - - //@Property - protected String someProperty; - - public String getState() { - return "SomeStateFromB"; - } - - public String getSomeProperty() { - return someProperty; - } - -} diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java deleted file mode 100644 index 659eff8798..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.vtest.assembly.ctypefile.impl; - -import org.apache.tuscany.sca.vtest.assembly.ctypefile.CService; - -public class CServiceImpl implements CService { - - //@Property - protected String someProperty = "test"; - - public String getState() { - return "SomeStateFromB"; - } - - public String getSomeProperty() { - return someProperty; - } - -} - diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java deleted file mode 100644 index dce6e24902..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.vtest.assembly.ctypefile.impl; - -import org.apache.tuscany.sca.vtest.assembly.ctypefile.DService; - -public class DServiceImpl implements DService { - - //@Property - protected String someProperty = "test"; - - public String getState() { - return "SomeStateFromB"; - } - - public String getSomeProperty() { - return someProperty; - } - -} - diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite deleted file mode 100644 index 715e22b318..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-typefile-Composite"> - - <component name="CComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.CServiceImpl"/> - </component> - -</composite> diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite deleted file mode 100644 index a8ae946647..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-typefile-Composite"> - - <component name="DComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.DServiceImpl"/> - </component> - -</composite> diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType deleted file mode 100644 index 173203ae21..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0"> - - <service name="AService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.AService"/> - </service> - - <reference name="bService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.BService"/> - </reference> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType deleted file mode 100644 index c6a0f274c4..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType +++ /dev/null @@ -1,28 +0,0 @@ -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <service name="BService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.BService"/> - </service> - - <property name="someProperty" type="xsd:string">componentTypeValue</property> - -</componentType> -
\ No newline at end of file diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType deleted file mode 100644 index 4a0fed82ac..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<componentType - xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://assembly-tests" - constrainingType="xmlns:CT"> - - <service name="CService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.CService"/> - </service> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType deleted file mode 100644 index e639b55986..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<constrainingType - xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://assembly-tests" - name="CT"> - <service name="CService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.CService"/> - </service> -</constrainingType> diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType deleted file mode 100644 index 47e7a4b6ea..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<componentType - xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://assembly-tests" - constrainingType="xmlns:DT"> - - <service name="DService"> - <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.DService"/> - </service> - -</componentType>
\ No newline at end of file diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/typefile.composite deleted file mode 100644 index 634101d95b..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/main/resources/typefile.composite +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://assembly-tests" - name="Assemby-component-typefile-Composite"> - - <component name="AComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.AServiceImpl"/> - <reference name="bService" target="BComponent/BService"/> - <reference name="b2Service" target="BComponent/BService"/> - </component> - - <component name="BComponent"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.BServiceImpl"/> - <property name="someProperty">compositeValue</property> - </component> - - <component name="BComponent2"> - <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.BServiceImpl"/> - </component> - -</composite> diff --git a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/branches/sca-java-1.5/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java deleted file mode 100644 index d2d2257277..0000000000 --- a/branches/sca-java-1.5/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.vtest.assembly.ctypefile; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.vtest.utilities.ServiceFinder; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * - */ -public class CompomnentTypeFileTestCase { - - //protected static String compositeName = "typefile.composite"; - protected static AService aService = null; - protected static BService bService2 = null; - protected static CService cService = null; - protected static DService dService = null; - - //@BeforeClass - public static void init(String compositeName) throws Exception { - try { - System.out.println("Setting up"); - ServiceFinder.init(compositeName); - //aService = ServiceFinder.getService(AService.class, "AComponent/AService"); - //bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - - //@AfterClass - public static void destroy() throws Exception { - - System.out.println("Cleaning up"); - ServiceFinder.cleanup(); - - } - - /** - * Lines 435-439: - * <p> - * Step two covers the cases where introspection of the implementation is - * not possible or where it does not provide complete information and it - * involves looking for an SCA component type file. Component type - * information found in the component type file must be compatible with the - * equivalent information found from inspection of the implementation. - * <p> - * Lines 441-444: - * <p> - * In the ideal case, the component type information is determined by - * inspecting the implementation, for example as code annotations. The - * component type file provides a mechanism for the provision of component - * type information for implementation types where the information cannot be - * determined by inspecting the implementation. - */ - @Test - public void typeFile1() throws Exception { - init("typefile.composite"); - aService = ServiceFinder.getService(AService.class, "AComponent/AService"); - bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); - Assert.assertSame("SomeStateFromB", aService.getState()); - destroy(); - } - - /** - * Lines 439-449: - * <p> - * The component type file can specify partial information, with the - * remainder being derived from the implementation. - * <p> - * The first test makes use of the reference to b which is provided by the - * type file. The second test makes use of the reference to b2 which is - * provided via annotation - */ - @Test - public void typeFile2() throws Exception { - init("typefile.composite"); - aService = ServiceFinder.getService(AService.class, "AComponent/AService"); - bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); - Assert.assertSame("SomeStateFromB", aService.getState()); - Assert.assertSame("SomeStateFromB", aService.getState2()); - destroy(); - } - - /** - * Lines 450-451: - * <p> - * The componentType element can contain Service elements, Reference - * elements and Property elements. - */ - @Test - public void typeFile3() throws Exception { - init("typefile.composite"); - aService = ServiceFinder.getService(AService.class, "AComponent/AService"); - bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); - Assert.assertEquals("compositeValue", aService.getBProperty()); - destroy(); - } - - public void typeFile31() throws Exception { - init("typefile.composite"); - aService = ServiceFinder.getService(AService.class, "AComponent/AService"); - bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); - Assert.assertEquals("componentTypeValue", bService2.getSomeProperty()); - destroy(); - } - - /** - * Lines 2204-2205: - * <p> - * A constrainingType can be applied to an implementation. In this case, - * the implementation's componentType has a constrainingType attribute set to - * the QName of the constrainingType. - * <p> - * ASM40002 - * <p> - * If present, the @constrainingType attribute of a <componentType/> element - * MUST reference a <constrainingType/> element in the Domain through its QName. - * <p> - * Description of how the OSOA function differs from the OASIS function: - * <p> - * The OASIS spec explicitly requires the <constrainingType/> element, - * whereas the OSOA spec implies the <constrainingType/> element is needed. - * <p> - */ - @Test - public void ASM40002_positive() throws Exception { - System.out.println("Running ASM40002 positive test"); - init("constrainingtype.composite"); - cService = ServiceFinder.getService(CService.class, "CComponent/CService"); - cService.getSomeProperty(); - destroy(); - } - - /** - * Lines 2204-2205: - * <p> - * A constrainingType can be applied to an implementation. In this case, - * the implementation's componentType has a constrainingType attribute set to - * the QName of the constrainingType. - * <p> - * ASM40002 - * <p> - * If present, the @constrainingType attribute of a <componentType/> element - * MUST reference a <constrainingType/> element in the Domain through its QName. - * <p> - * Description of how the OSOA function differs from the OASIS function: - * <p> - * The OASIS spec explicitly requires the <constrainingType/> element, - * whereas the OSOA spec implies the <constrainingType/> element is needed. - * <p> - */ - @Test - public void ASM40002_negative() throws Exception { - System.out.println("Running ASM40002 negative test"); - init("noconstrainingtype.composite"); - dService = ServiceFinder.getService(DService.class, "DComponent/DService"); - dService.getSomeProperty(); - destroy(); - } - -} |