You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/03/12 10:51:41 UTC
svn commit: r752817 [1/2] - in
/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src:
main/java/org/apache/tuscany/sca/vtest/assembly/composite/
main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/
main/resources/ test/java/org/apache/...
Author: slaws
Date: Thu Mar 12 09:51:29 2009
New Revision: 752817
URL: http://svn.apache.org/viewvc?rev=752817&view=rev
Log:
TUSCANY-2884 - more composite vtests. Thanks for the patch Susan.
Added:
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositeb.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositec.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentlocalwire.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_inner.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_outer.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_inner.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_outer.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subinterfacewire.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subreferenceinterface_inner.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subreferenceinterface_outer.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subserviceinterface_inner.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/subserviceinterface_outer.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/wire.composite (with props)
Removed:
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference.composite
Modified:
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/composite.composite
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositecopy.composite
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/test/java/org/apache/tuscany/sca/vtest/assembly/composite/CompositeTestCase.java
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CService.java Thu Mar 12 09:51:29 2009
@@ -23,7 +23,7 @@
/**
*
*/
-public interface CService {
+public interface CService extends CSubService{
public String getState();
public String getName();
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java Thu Mar 12 09:51:29 2009
@@ -0,0 +1,30 @@
+/*
+ * 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.composite;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ *
+ */
+public interface CSubService {
+
+ public String getState();
+
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSubService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java Thu Mar 12 09:51:29 2009
@@ -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.composite;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ *
+ */
+public interface CSuperService extends CService{
+
+ public String getState();
+ public String getName();
+ public String getString();
+
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/CSuperService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java Thu Mar 12 09:51:29 2009
@@ -0,0 +1,30 @@
+/*
+ * 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.composite;
+
+
+/**
+ * Simple Local service.
+ */
+
+public interface DLocalSubService {
+
+ public String getGreetings(String name);
+ public String getSomeProperty();
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DLocalSubService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DService.java Thu Mar 12 09:51:29 2009
@@ -27,4 +27,5 @@
public interface DService {
public String getGreetings(String name);
+ public String getSomeProperty();
}
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DServiceComponent.java Thu Mar 12 09:51:29 2009
@@ -32,6 +32,10 @@
public String getGreetings(String name) {
return helloWorldService.getGreetings(name);
}
+
+ public String getSomeProperty() {
+ return helloWorldService.getSomeProperty();
+ }
public DService getHelloWorldService() {
return helloWorldService;
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java Thu Mar 12 09:51:29 2009
@@ -0,0 +1,31 @@
+/*
+ * 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.composite;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Remotable service.
+ */
+@Remotable
+public interface DSubService {
+
+ //public String getGreetings(String name);
+ public String getSomeProperty();
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSubService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java Thu Mar 12 09:51:29 2009
@@ -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.composite;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * Simple Remotable service.
+ */
+@Remotable
+public interface DSuperService {
+
+ public String getGreetings(String name);
+ public String getSomeProperty();
+ public String getString();
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/DSuperService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/FService.java Thu Mar 12 09:51:29 2009
@@ -18,9 +18,12 @@
*/
package org.apache.tuscany.sca.vtest.assembly.composite;
+import org.osoa.sca.annotations.Remotable;
+
/**
* Simple Remotable Service
*/
+@Remotable
public interface FService {
public String getString(String a);
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CServiceImpl.java Thu Mar 12 09:51:29 2009
@@ -19,7 +19,12 @@
package org.apache.tuscany.sca.vtest.assembly.composite.impl;
-public class CServiceImpl {
+import org.osoa.sca.annotations.Service;
+import org.apache.tuscany.sca.vtest.assembly.composite.CService;
+
+@Service(CService.class)
+
+public class CServiceImpl implements CService{
private String state = "Some State";
private String name = "CServiceImpl";
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java Thu Mar 12 09:51:29 2009
@@ -0,0 +1,37 @@
+/*
+ * 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.composite.impl;
+
+import org.osoa.sca.annotations.Service;
+import org.apache.tuscany.sca.vtest.assembly.composite.CSubService;
+
+@Service(CSubService.class)
+
+public class CSubServiceImpl implements CSubService{
+
+ private String state = "Some State";
+
+ public String getState() {
+ return state;
+ }
+
+
+}
+
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSubServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java Thu Mar 12 09:51:29 2009
@@ -0,0 +1,45 @@
+/*
+ * 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.composite.impl;
+
+import org.osoa.sca.annotations.Service;
+import org.apache.tuscany.sca.vtest.assembly.composite.CSuperService;
+
+@Service(CSuperService.class)
+
+public class CSuperServiceImpl implements CSuperService{
+
+ private String state = "Some State";
+ private String name = "CServiceImpl";
+
+ public String getState() {
+ return state;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getString() {
+ return name;
+ }
+
+}
+
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/CSuperServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DServiceImpl.java Thu Mar 12 09:51:29 2009
@@ -27,5 +27,10 @@
public String getGreetings(String name) {
return "Hello, " + name;
}
+
+ public String getSomeProperty()
+ {
+ return "DProperty";
+ }
}
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java Thu Mar 12 09:51:29 2009
@@ -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.composite.impl;
+
+import org.apache.tuscany.sca.vtest.assembly.composite.DSubService;
+import org.osoa.sca.annotations.Service;
+
+@Service(DSubService.class)
+public class DSubServiceImpl implements DSubService {
+
+ public String getSomeProperty()
+ {
+ return "DProperty";
+ }
+
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSubServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java Thu Mar 12 09:51:29 2009
@@ -0,0 +1,43 @@
+/*
+ * 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.composite.impl;
+
+
+import org.apache.tuscany.sca.vtest.assembly.composite.DSuperService;
+import org.osoa.sca.annotations.Service;
+
+@Service(DSuperService.class)
+public class DSuperServiceImpl implements DSuperService {
+
+ public String getGreetings(String name) {
+ return "Hello, " + name;
+ }
+
+ public String getSomeProperty()
+ {
+ return "DProperty";
+ }
+
+ public String getString() {
+ // TODO Auto-generated method stub
+ return "DSuperServiceImpl";
+ }
+
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/DSuperServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/java/org/apache/tuscany/sca/vtest/assembly/composite/impl/FServiceImpl.java Thu Mar 12 09:51:29 2009
@@ -20,7 +20,7 @@
package org.apache.tuscany.sca.vtest.assembly.composite.impl;
import org.apache.tuscany.sca.vtest.assembly.composite.FService;
-import org.apache.tuscany.sca.vtest.assembly.composite.EService;
+import org.apache.tuscany.sca.vtest.assembly.composite.CService;
import org.apache.tuscany.sca.vtest.assembly.composite.DService;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
@@ -29,17 +29,17 @@
public class FServiceImpl implements FService {
@Reference
- protected EService e;
+ protected CService c;
@Reference
protected DService d;
public String getString(String a) {
- return e.getString(a);
+ return c.getState();
}
public String getGreetings(String name) {
- return d.getGreetings(name);
+ return d.getSomeProperty();
}
}
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/composite.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/composite.composite?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/composite.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/composite.composite Thu Mar 12 09:51:29 2009
@@ -20,12 +20,11 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://assembly-tests"
- name="Assemby-composite--Composite">
+ name="Assembly-composite--Composite">
<component name="BComponent">
<implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
<property name="someProperty">some b component value</property>
</component>
-
-
-</composite>
+
+</composite>
\ No newline at end of file
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositeb.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositeb.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositeb.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositeb.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,31 @@
+<?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="Assembly-composite-b--Composite">
+
+ <component name="BComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
+ <property name="someProperty">some b component value</property>
+ </component>
+
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositeb.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositeb.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositeb.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositec.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositec.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositec.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositec.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,32 @@
+<?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="Assembly-composite-c--Composite">
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ <service name="CService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
+ </service>
+ </component>
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositec.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositec.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositec.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositecopy.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositecopy.composite?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositecopy.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/compositecopy.composite Thu Mar 12 09:51:29 2009
@@ -20,11 +20,11 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://assembly-tests"
- name="Assemby-composite--Composite">
+ name="Assembly-composite--Composite">
<component name="CComponent">
<implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CServiceImpl">
+ <service name="CService">
<interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
</service>
</component>
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentlocalwire.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentlocalwire.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentlocalwire.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,53 @@
+<?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="Assembly-different-local-wire--Composite">
+
+ <component name="FComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.FServiceImpl"/>
+ <reference name="d">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DLocalSubService" />
+ </reference>
+ <reference name="c">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" />
+ </reference>
+ </component>
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ <service name="CService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
+ </service>
+ </component>
+
+
+ <component name="DComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.DServiceImpl"/>
+ <service name="DService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.DService" />
+ </service>
+ </component>
+
+ <wire source="FComponent/d" target="DComponent" />
+ <wire source="FComponent/c" target="CComponent" />
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentlocalwire.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,42 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-different-reference-interface-inner-Composite">
+
+ <service name="AService" promote="AComponent"/>
+
+ <component name="AComponent">
+ <implementation.java
+ class="org.apache.tuscany.sca.vtest.assembly.composite.impl.AServiceImpl" />
+ <reference name="b">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.BService" />
+ </reference>
+ </component>
+
+ <reference name="c" promote="AComponent/b">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService" />
+ </reference>
+
+
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_inner.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,37 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-different-reference-interface-outer-Composite">
+
+ <component name="DifferentInterfaceComponent">
+ <implementation.composite name="assembly-tests:Assembly-different-reference-interface-inner-Composite"/>
+ <reference name="c" target="CComponent"/>
+ </component>
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ </component>
+
+
+</composite>
+
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentreferenceinterface_outer.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,39 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-different-service-interface-inner-Composite">
+
+ <service name="DifferentInterfaceService" promote="CComponent">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.BService">
+ </interface.java>
+ </service>
+
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ <service name="CService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
+ </service>
+ </component>
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_inner.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,32 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-different-service-interface-outer-Composite">
+
+ <component name="DifferentInterfaceComponent">
+
+ <implementation.composite name="assembly-tests:Assembly-different-service-interface-inner-Composite"/>
+
+ </component>
+</composite>
+
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/differentserviceinterface_outer.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonpromote_outer.composite Thu Mar 12 09:51:29 2009
@@ -28,5 +28,4 @@
<implementation.composite name="assembly-tests:Assembly-non-promote-inner-Composite"/>
</component>
-</composite>
-
+</composite>
\ No newline at end of file
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,38 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-non-reference-promote-inner-Composite">
+
+ <service name="AService" promote="AComponent"/>
+
+ <component name="AComponent">
+ <implementation.java
+ class="org.apache.tuscany.sca.vtest.assembly.composite.impl.AServiceImpl" />
+ <reference name="b" />
+ <reference name="c" />
+ </component>
+
+ <reference name="referenceB" promote="AComponent/b" />
+ <reference name="referenceC" promote="AComponent/NonReference" />
+
+</composite>
\ No newline at end of file
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_inner.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,44 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-non-reference-promote-outer-Composite">
+
+ <component name="TestNonPromoteComponent">
+
+ <implementation.composite name="assembly-tests:Assembly-non-reference-promote-inner-Composite"/>
+ <reference name="referenceB" target="BComponent"/>
+ <reference name="referenceC" target="CComponent"/>
+ </component>
+
+ <component name="BComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
+ <property name="someProperty">some b component value</property>
+ </component>
+
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ </component>
+
+</composite>
+
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonreferencepromote_outer.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,42 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-non-service-promote-inner-Composite">
+
+ <service name="BService" promote="BComponent"/>
+ <service name="CService" promote="CComponent"/>
+ <service name="NoPromoteService" promote="NoPromoteComponent"/>
+
+ <component name="BComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
+ <property name="someProperty">some b component value</property>
+ </component>
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ <service name="CService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
+ </service>
+ </component>
+
+</composite>
\ No newline at end of file
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_inner.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,31 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-non-service-promote-outer-Composite">
+
+ <component name="TestNonPromoteComponent">
+
+ <implementation.composite name="assembly-tests:Assembly-non-service-promote-inner-Composite"/>
+
+ </component>
+</composite>
\ No newline at end of file
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonservicepromote_outer.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_inner.composite Thu Mar 12 09:51:29 2009
@@ -30,10 +30,5 @@
<reference name="NonUniqueReference" promote="AComponent/b" />
<reference name="NonUniqueReference" promote="AComponent/c" />
-
- <!--
- <reference name="b" promote="AComponent/b" />
- <reference name="c" promote="AComponent/c" />
- -->
-</composite>
+</composite>
\ No newline at end of file
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniquereference_outer.composite Thu Mar 12 09:51:29 2009
@@ -39,5 +39,4 @@
<implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
</component>
-
-</composite>
+</composite>
\ No newline at end of file
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_inner.composite Thu Mar 12 09:51:29 2009
@@ -25,7 +25,6 @@
<service name="BCService" promote="CComponent"/>
<service name="BCService" promote="BComponent"/>
-
<component name="BComponent">
<implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
@@ -34,9 +33,9 @@
<component name="CComponent">
<implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
- <service name="CServiceImpl">
+ <service name="CService">
<interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
</service>
</component>
-</composite>
+</composite>
\ No newline at end of file
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite?rev=752817&r1=752816&r2=752817&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/nonuniqueservice_outer.composite Thu Mar 12 09:51:29 2009
@@ -28,5 +28,4 @@
<implementation.composite name="assembly-tests:Assembly-non-unique-service-inner-Composite"/>
</component>
-</composite>
-
+</composite>
\ No newline at end of file
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_inner.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_inner.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_inner.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_inner.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,34 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-reference-inner--Composite">
+
+ <service name="AService" promote="AComponent"/>
+
+ <component name="AComponent">
+ <implementation.java
+ class="org.apache.tuscany.sca.vtest.assembly.composite.impl.AServiceImpl" />
+ <reference name="b" />
+ <reference name="c" />
+ </component>
+
+ <reference name="b" promote="AComponent/b" />
+ <reference name="c" promote="AComponent/c" />
+
+</composite>
\ No newline at end of file
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_inner.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_inner.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_inner.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_outer.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_outer.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_outer.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_outer.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,42 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ name="Assembly-reference-outer--Composite">
+
+ <component name="TestReferenceComponent">
+ <implementation.composite name="assembly-tests:Assembly-reference-inner--Composite"/>
+ <reference name="b" target="BComponent"/>
+ <reference name="c" target="CComponent"/>
+ </component>
+
+ <component name="BComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
+ <property name="someProperty">some b component value</property>
+ </component>
+
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ </component>
+
+</composite>
\ No newline at end of file
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_outer.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_outer.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/reference_outer.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_inner.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_inner.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_inner.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_inner.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,42 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ targetNamespace="http://assembly-tests"
+ name="Assembly-service-inner-Composite">
+
+ <service name="CService" promote="CComponent"/>
+ <service name="BService" promote="BComponent"/>
+
+
+ <component name="BComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.BServiceImpl"/>
+ <property name="someProperty">some b component value</property>
+ </component>
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.composite.impl.CServiceImpl"/>
+ <service name="CService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.composite.CService"/>
+ </service>
+ </component>
+
+</composite>
\ No newline at end of file
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_inner.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_inner.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_inner.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_outer.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_outer.composite?rev=752817&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_outer.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_outer.composite Thu Mar 12 09:51:29 2009
@@ -0,0 +1,32 @@
+<?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"
+ xmlns:assembly-tests="http://assembly-tests"
+ name="Assembly-reference-outer--Composite">
+
+ <component name="TestServiceComponent">
+
+ <implementation.composite name="assembly-tests:Assembly-service-inner-Composite"/>
+
+ </component>
+
+</composite>
\ No newline at end of file
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_outer.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_outer.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/composite/src/main/resources/service_outer.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml