Author: rfeng
Date: Wed Sep 5 15:08:20 2007
New Revision: 573084
URL: http://svn.apache.org/viewvc?rev=573084&view=rev
Log:
Fix errors in the composite files for itests
Modified:
incubator/tuscany/java/sca/itest/properties/src/main/resources/Outer.composite
incubator/tuscany/java/sca/itest/properties/src/main/resources/mySimpleService.composite
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
incubator/tuscany/java/sca/itest/services/src/main/resources/ServicesTest.composite
incubator/tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
Modified:
incubator/tuscany/java/sca/itest/properties/src/main/resources/Outer.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/resources/Outer.composite?rev=573084&r1=573083&r2=573084&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/properties/src/main/resources/Outer.composite
(original)
+++
incubator/tuscany/java/sca/itest/properties/src/main/resources/Outer.composite
Wed Sep 5 15:08:20 2007
@@ -21,8 +21,8 @@
xsi:schemaLocation="http://www.osoa.org/xmlns/sca/1.0
http://www.osoa.org/xmlns/sca/1.0"; name="Iteration3Composite"
targetNamespace="http://foo"; local="true" autowire="false"
requires="cns:confidentiality" policySets="sns:secure">
- <property name="newLocation" type="anyURI">Raleigh</property>
- <property name="newYear" type="anyURI">2008</property>
+ <property name="newLocation" type="xsd:anyURI">Raleigh</property>
+ <property name="newYear" type="xsd:anyURI">2008</property>
<component name="MyServiceComponent">
<implementation.java class="mysca.test.myservice.impl.MyServiceImpl" />
</component>
Modified:
incubator/tuscany/java/sca/itest/properties/src/main/resources/mySimpleService.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/resources/mySimpleService.composite?rev=573084&r1=573083&r2=573084&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/properties/src/main/resources/mySimpleService.composite
(original)
+++
incubator/tuscany/java/sca/itest/properties/src/main/resources/mySimpleService.composite
Wed Sep 5 15:08:20 2007
@@ -27,8 +27,8 @@
<interface.java interface="mysca.test.myservice.impl.MyService" />
</service>
- <property name="newLocation" type="anyURI">Raleigh</property>
- <property name="newYear" type="anyURI">2008</property>
+ <property name="newLocation" type="xsd:anyURI">Raleigh</property>
+ <property name="newYear" type="xsd:anyURI">2008</property>
<component name="MyServiceComponentNew">
Modified:
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java?rev=573084&r1=573083&r2=573084&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
(original)
+++
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
Wed Sep 5 15:08:20 2007
@@ -19,7 +19,9 @@
package org.apache.tuscany.sca.itest.services;
+import org.osoa.sca.annotations.Remotable;
[EMAIL PROTECTED]
public interface AComponent {
String foo();
}
Modified:
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java?rev=573084&r1=573083&r2=573084&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
(original)
+++
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
Wed Sep 5 15:08:20 2007
@@ -19,9 +19,9 @@
package org.apache.tuscany.sca.itest.services;
-import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Remotable;
[EMAIL PROTECTED]
[EMAIL PROTECTED]
public interface CComponent {
- String foo();
+ String foo();
}
Modified:
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java?rev=573084&r1=573083&r2=573084&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
(original)
+++
incubator/tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
Wed Sep 5 15:08:20 2007
@@ -21,8 +21,8 @@
public class CComponentImpl implements CComponent {
- public String foo() {
- return "CComponent";
- }
+ public String foo() {
+ return "CComponent";
+ }
}
Modified:
incubator/tuscany/java/sca/itest/services/src/main/resources/ServicesTest.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/src/main/resources/ServicesTest.composite?rev=573084&r1=573083&r2=573084&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/services/src/main/resources/ServicesTest.composite
(original)
+++
incubator/tuscany/java/sca/itest/services/src/main/resources/ServicesTest.composite
Wed Sep 5 15:08:20 2007
@@ -26,7 +26,7 @@
<component name="AComponent2">
<implementation.java
class="org.apache.tuscany.sca.itest.services.AComponentImpl" />
- <service name="AComponent2Service">
+ <service name="AComponent">
<interface.java
interface="org.apache.tuscany.sca.itest.services.AComponent" />
</service>
</component>
@@ -37,7 +37,7 @@
<component name="BComponent2">
<implementation.java
class="org.apache.tuscany.sca.itest.services.BComponentImpl" />
- <service name="BComponent2Service">
+ <service name="BComponent">
<interface.java
interface="org.apache.tuscany.sca.itest.services.BComponent" />
</service>
</component>
@@ -48,7 +48,7 @@
<component name="CComponent2">
<implementation.java
class="org.apache.tuscany.sca.itest.services.CComponentImpl" />
- <service name="CComponent2Service">
+ <service name="CComponent">
<interface.java
interface="org.apache.tuscany.sca.itest.services.CComponent" />
</service>
</component>
@@ -59,10 +59,10 @@
<component name="DComponent2">
<implementation.java
class="org.apache.tuscany.sca.itest.services.DComponentImpl" />
- <service name="DComponent2Service">
+ <service name="DComponent">
<interface.java
interface="org.apache.tuscany.sca.itest.services.DComponent" />
</service>
- <service name="D1Component2Service">
+ <service name="D1Component">
<interface.java
interface="org.apache.tuscany.sca.itest.services.D1Component" />
</service>
</component>
Modified:
incubator/tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java?rev=573084&r1=573083&r2=573084&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
Wed Sep 5 15:08:20 2007
@@ -46,7 +46,7 @@
AComponent a1 = domain.getService(AComponent.class, "AComponent1");
assertEquals("AComponent", a1.foo());
- AComponent a2 = domain.getService(AComponent.class,
"AComponent2/AComponent2Service");
+ AComponent a2 = domain.getService(AComponent.class,
"AComponent2/AComponent");
assertEquals("AComponent", a2.foo());
}
@@ -55,7 +55,7 @@
BComponent a1 = domain.getService(BComponent.class, "BComponent1");
assertEquals("BComponent", a1.foo());
- BComponent a2 = domain.getService(BComponent.class,
"BComponent2/BComponent2Service");
+ BComponent a2 = domain.getService(BComponent.class,
"BComponent2/BComponent");
assertEquals("BComponent", a2.foo());
}
@@ -64,7 +64,7 @@
CComponent a1 = domain.getService(CComponent.class, "CComponent1");
assertEquals("CComponent", a1.foo());
- CComponent a2 = domain.getService(CComponent.class,
"CComponent2/CComponent2Service");
+ CComponent a2 = domain.getService(CComponent.class,
"CComponent2/CComponent");
assertEquals("CComponent", a2.foo());
}
@@ -83,10 +83,10 @@
Assert.assertTrue("The service name is required", true);
}
- DComponent a3 = domain.getService(DComponent.class,
"DComponent2/DComponent2Service");
+ DComponent a3 = domain.getService(DComponent.class,
"DComponent2/DComponent");
assertEquals("DComponent", a3.foo());
- D1Component a4 = domain.getService(D1Component.class,
"DComponent2/D1Component2Service");
+ D1Component a4 = domain.getService(D1Component.class,
"DComponent2/D1Component");
assertEquals("DComponent", a4.foo1());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
