Return-Path: Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org Received: (qmail 36035 invoked from network); 3 Jun 2008 21:04:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Jun 2008 21:04:16 -0000 Received: (qmail 18360 invoked by uid 500); 3 Jun 2008 21:04:19 -0000 Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org Received: (qmail 18339 invoked by uid 500); 3 Jun 2008 21:04:19 -0000 Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tuscany-dev@ws.apache.org Delivered-To: mailing list tuscany-commits@ws.apache.org Received: (qmail 18330 invoked by uid 99); 3 Jun 2008 21:04:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jun 2008 14:04:19 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jun 2008 21:03:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5D2002388A26; Tue, 3 Jun 2008 14:03:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r662887 - in /incubator/tuscany/java/sca/vtest: ./ assembly/ assembly/ctypefile/ assembly/ctypefile/src/ assembly/ctypefile/src/main/ assembly/ctypefile/src/main/java/ assembly/ctypefile/src/main/java/org/ assembly/ctypefile/src/main/java/o... Date: Tue, 03 Jun 2008 21:03:41 -0000 To: tuscany-commits@ws.apache.org From: kwilliams@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080603210342.5D2002388A26@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kwilliams Date: Tue Jun 3 14:03:41 2008 New Revision: 662887 URL: http://svn.apache.org/viewvc?rev=662887&view=rev Log: Add structure for Assembly specification vtest Added: incubator/tuscany/java/sca/vtest/assembly/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml (with props) incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java (with props) incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java (with props) incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java (with props) incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java (with props) incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite (with props) incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java (with props) incubator/tuscany/java/sca/vtest/assembly/pom.xml (with props) Modified: incubator/tuscany/java/sca/vtest/pom.xml Added: incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml?rev=662887&view=auto ============================================================================== --- incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml (added) +++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml Tue Jun 3 14:03:41 2008 @@ -0,0 +1,49 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + vtest-assembly + 2.0-incubating-SNAPSHOT + ../pom.xml + + vtest-assembly-ctypefile + + Apache Tuscany SCA Assembly Verification Tests - Component Type File + + + + org.apache.tuscany.sca + tuscany-host-embedded + 2.0-incubating-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 2.0-incubating-SNAPSHOT + runtime + + + + + + Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java?rev=662887&view=auto ============================================================================== --- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java (added) +++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java Tue Jun 3 14:03:41 2008 @@ -0,0 +1,28 @@ +/* + * 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(); + +} Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java?rev=662887&view=auto ============================================================================== --- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java (added) +++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java Tue Jun 3 14:03:41 2008 @@ -0,0 +1,28 @@ +/* + * 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(); + +} Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java?rev=662887&view=auto ============================================================================== --- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java (added) +++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java Tue Jun 3 14:03:41 2008 @@ -0,0 +1,38 @@ +/* + * 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; +import org.osoa.sca.annotations.Service; + +@Service(AService.class) +public class AServiceImpl implements AService { + + @Reference + protected BService b; + + public String getState() { + return b.getState(); + } + +} + Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java?rev=662887&view=auto ============================================================================== --- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java (added) +++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java Tue Jun 3 14:03:41 2008 @@ -0,0 +1,32 @@ +/* + * 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; +import org.osoa.sca.annotations.Service; + +//@Service(BService.class) +public class BServiceImpl implements BService { + + public String getState() { + return "SomeStateFromB"; + } + +} Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite?rev=662887&view=auto ============================================================================== --- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite (added) +++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite Tue Jun 3 14:03:41 2008 @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java?rev=662887&view=auto ============================================================================== --- incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java (added) +++ incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java Tue Jun 3 14:03:41 2008 @@ -0,0 +1,63 @@ +/* + * 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; + +/** + * This test class tests the Service annotation described in section 1.2.1 and + * 1.8.17 + */ +public class CompomnentTypeFileTestCase { + + protected static String compositeName = "typefile.composite"; + protected static AService aService = null; + + @BeforeClass + public static void init() throws Exception { + try { + System.out.println("Setting up"); + ServiceFinder.init(compositeName); + aService = ServiceFinder.getService(AService.class, "AComponent"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + @AfterClass + public static void destroy() throws Exception { + + System.out.println("Cleaning up"); + ServiceFinder.cleanup(); + + } + + @Test + public void typeFile1() throws Exception { + String thisState = "This State"; + Assert.assertSame("SomeStateFromB", aService.getState()); + } + +} Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/tuscany/java/sca/vtest/assembly/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/assembly/pom.xml?rev=662887&view=auto ============================================================================== --- incubator/tuscany/java/sca/vtest/assembly/pom.xml (added) +++ incubator/tuscany/java/sca/vtest/assembly/pom.xml Tue Jun 3 14:03:41 2008 @@ -0,0 +1,68 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-vtest + 2.0-incubating-SNAPSHOT + ../pom.xml + + vtest-assembly + pom + Apache Tuscany SCA Assembly Verification Tests + + + + org.apache.tuscany.sca + tuscany-host-embedded + 2.0-incubating-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 2.0-incubating-SNAPSHOT + runtime + + + + org.apache.tuscany.sca + vtest-utilities + 2.0-incubating-SNAPSHOT + runtime + + + + + + + + default + + true + + + ctypefile + + + + + Propchange: incubator/tuscany/java/sca/vtest/assembly/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/java/sca/vtest/assembly/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/java/sca/vtest/assembly/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/tuscany/java/sca/vtest/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/pom.xml?rev=662887&r1=662886&r2=662887&view=diff ============================================================================== --- incubator/tuscany/java/sca/vtest/pom.xml (original) +++ incubator/tuscany/java/sca/vtest/pom.xml Tue Jun 3 14:03:41 2008 @@ -48,6 +48,7 @@ java-api wsbinding utilities + assembly