You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/10/24 06:31:01 UTC
svn commit: r587778 [3/13] - in /incubator/tuscany/branches/sca-java-1.0.1:
./ distribution/ distribution/bundle/ distribution/manifest/
distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/
distribution/webapp/src/main/resources/_node/ dist...
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java Tue Oct 23 21:30:02 2007
@@ -23,10 +23,10 @@
/**
* OSGi test program - procedural with components exposing multiple services with multiple interfaces
*/
-public abstract class InterfacesTestCase extends SupplyChainTestCase {
+public class InterfacesTestCase extends SupplyChainTestCase {
public InterfacesTestCase() {
- super("interfaces/interfaces-test.composite");
+ super("interfaces-test.composite", "interfaces");
}
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java Tue Oct 23 21:30:02 2007
@@ -25,7 +25,7 @@
public class DSProperties2TestCase extends Properties2TestCase {
public DSProperties2TestCase() {
- super("properties/properties2-ds-test.composite");
+ super("properties2-ds-test.composite", "properties/ds");
}
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java Tue Oct 23 21:30:02 2007
@@ -25,7 +25,7 @@
public class DSPropertiesTestCase extends PropertiesTestCase {
public DSPropertiesTestCase() {
- super("properties/properties-ds-test.composite");
+ super("properties-ds-test.composite", "properties/ds");
}
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java Tue Oct 23 21:30:02 2007
@@ -18,46 +18,32 @@
*/
package supplychain.properties;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
import stockquote.StockQuote;
-import util.OSGiTestUtil;
+import test.OSGiTestCase;
/**
* OSGi test program - procedural with business properties
*/
-public class Properties2TestCase extends TestCase {
+public class Properties2TestCase extends OSGiTestCase {
- private SCADomain scaDomain;
private StockQuote stockQuoteServiceUSD;
private StockQuote stockQuoteServiceEURO;
- private String compositeName;
public Properties2TestCase() {
- super();
- compositeName = "properties/properties2-test.composite";
+ super("properties2-test.composite", "properties");
}
- protected Properties2TestCase(String compositeName) {
- super();
- this.compositeName = compositeName;
+ protected Properties2TestCase(String compositeName, String contributionLocation) {
+ super(compositeName, contributionLocation);
}
protected void setUp() throws Exception {
- OSGiTestUtil.setUpOSGiTestRuntime();
-
- scaDomain = SCADomain.newInstance(compositeName);
+ super.setUp();
stockQuoteServiceUSD = scaDomain.getService(StockQuote.class, "USDStockQuoteComponent");
stockQuoteServiceEURO = scaDomain.getService(StockQuote.class, "EUROStockQuoteComponent");
- }
-
- protected void tearDown() throws Exception {
- scaDomain.close();
- OSGiTestUtil.shutdownOSGiRuntime();
}
public void test() throws Exception {
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java Tue Oct 23 21:30:02 2007
@@ -18,45 +18,30 @@
*/
package supplychain.properties;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
import stockquote.StockQuote;
-import util.OSGiTestUtil;
+import test.OSGiTestCase;
/**
* OSGi test program - procedural with business properties
*/
-public class PropertiesTestCase extends TestCase {
+public class PropertiesTestCase extends OSGiTestCase {
- private SCADomain scaDomain;
private StockQuote stockQuoteService;
- private String compositeName;
public PropertiesTestCase() {
- super();
- compositeName = "properties/properties-test.composite";
+ super("properties-test.composite", "properties");
}
- protected PropertiesTestCase(String compositeName) {
- super();
- this.compositeName = compositeName;
+ protected PropertiesTestCase(String compositeName, String contributionLocation) {
+ super(compositeName, contributionLocation);
}
protected void setUp() throws Exception {
-
- OSGiTestUtil.setUpOSGiTestRuntime();
-
- scaDomain = SCADomain.newInstance(compositeName);
+ super.setUp();
stockQuoteService = scaDomain.getService(StockQuote.class, "StockQuoteComponent");
}
- protected void tearDown() throws Exception {
- scaDomain.close();
- OSGiTestUtil.shutdownOSGiRuntime();
- }
public void test() throws Exception {
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java Tue Oct 23 21:30:02 2007
@@ -26,7 +26,7 @@
public class DSServicesTestCase extends SupplyChainTestCase {
public DSServicesTestCase() {
- super("services/services-ds-test.composite");
+ super("services-ds-test.composite", "services/ds");
}
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java Tue Oct 23 21:30:02 2007
@@ -26,7 +26,7 @@
public class ServicesTestCase extends SupplyChainTestCase {
public ServicesTestCase() {
- super("services/services-test.composite");
+ super("services-test.composite", "services");
}
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java Tue Oct 23 21:30:02 2007
@@ -26,7 +26,7 @@
public class DSVersionTestCase extends VersionedSupplyChainTestCase {
public DSVersionTestCase() {
- super("version/version-ds-test.composite");
+ super("version-ds-test.composite", "version/ds");
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java Tue Oct 23 21:30:02 2007
@@ -26,7 +26,7 @@
public class VersionTestCase extends VersionedSupplyChainTestCase {
public VersionTestCase() {
- super("version/version-test.composite");
+ super("version-test.composite", "version");
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java Tue Oct 23 21:30:02 2007
@@ -26,7 +26,7 @@
public class DSWiring1TestCase extends SupplyChainTestCase {
public DSWiring1TestCase() {
- super("wiring/wiring-ds-test1.composite");
+ super("wiring-ds-test1.composite", "wiring/ds");
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java Tue Oct 23 21:30:02 2007
@@ -26,7 +26,7 @@
public class DSWiring2TestCase extends SupplyChainTestCase {
public DSWiring2TestCase() {
- super("wiring/wiring-ds-test2.composite");
+ super("wiring-ds-test2.composite", "wiring/ds");
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java Tue Oct 23 21:30:02 2007
@@ -26,7 +26,7 @@
public class Wiring1TestCase extends SupplyChainTestCase {
public Wiring1TestCase() {
- super("wiring/wiring-test1.composite");
+ super("wiring-test1.composite", "wiring");
}
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java Tue Oct 23 21:30:02 2007
@@ -26,7 +26,7 @@
public class Wiring2TestCase extends SupplyChainTestCase {
public Wiring2TestCase() {
- super("wiring/wiring-test2.composite");
+ super("wiring-test2.composite", "wiring");
}
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties Tue Oct 23 21:30:02 2007
@@ -40,5 +40,5 @@
#
# Bundle config properties.
#
-org.osgi.service.http.port=8080
+org.osgi.service.http.port=8085
obr.shell.telnet=on
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/pom.xml Tue Oct 23 21:30:02 2007
@@ -45,6 +45,7 @@
<module>callback-set-callback</module>
<module>callback-set-conversation</module>
<module>contribution</module>
+ <module>contribution-multiple</module>
<module>contribution-import-export</module>
<module>conversations</module>
<module>databindings</module>
@@ -68,6 +69,10 @@
<module>services</module>
<module>component-type</module>
<module>interfaces</module>
+ <module>wires</module>
+ <!--
+ <module>callback-separatethread</module>
+ -->
<module>scopes</module>
<module>wsdl</module>
<module>wsdlless</module>
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java Tue Oct 23 21:30:02 2007
@@ -1,36 +1,62 @@
-/*
- * 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.itest;
-
-import java.util.Collection;
-
-import commonj.sdo.DataObject;
-
-
-public interface PropertyComponent {
- public String getLocation();
- public String getYear();
- public ComplexPropertyBean getComplexPropertyOne();
- public ComplexPropertyBean getComplexPropertyTwo();
- public ComplexPropertyBean getComplexPropertyThree();
- public Collection<ComplexPropertyBean> getComplexPropertyFour();
- public DataObject getSdoProperty();
- public DataObject getCustomerSdo();
-}
+/*
+ * 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.itest;
+
+import java.util.Collection;
+
+import commonj.sdo.DataObject;
+
+
+public interface PropertyComponent {
+ public String getLocation();
+ public String getLocationFromComponentContext();
+ public String getYear();
+
+ /**
+ * This method is used to test injecting a primitive String Array
+ * @return The injected array
+ */
+ public String[] getDaysOfTheWeek();
+
+ /**
+ * This method is used to test injecting an Object Integer Array
+ * @return The injected array
+ */
+ public Integer[] getIntegerNumbers();
+
+ /**
+ * This method is used to test injecting an int Array
+ * @return The injected array
+ */
+ public int[] getIntNumbers();
+
+ /**
+ * This method is used to test injecting an Object Array
+ * @return The injected array
+ */
+ public DataObject[] getSdoArrayProperty();
+
+ public ComplexPropertyBean getComplexPropertyOne();
+ public ComplexPropertyBean getComplexPropertyTwo();
+ public ComplexPropertyBean getComplexPropertyThree();
+ public Collection<ComplexPropertyBean> getComplexPropertyFour();
+ public DataObject getSdoProperty();
+ public DataObject getCustomerSdo();
+}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java Tue Oct 23 21:30:02 2007
@@ -1,99 +1,152 @@
-/*
- * 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.itest;
-
-import java.util.Collection;
-
-import org.osoa.sca.annotations.Property;
-
-import com.example.customer.sdo.impl.CustomerImpl;
-import commonj.sdo.DataObject;
-
-public class PropertyComponentImpl implements PropertyComponent {
-
- @Property
- protected CustomerImpl customerSdo;
-
- @Property
- protected DataObject sdoProperty;
-
- @Property
- protected ComplexPropertyBean complexPropertyOne;
-
- @Property
- protected ComplexPropertyBean complexPropertyTwo;
-
- @Property
- protected ComplexPropertyBean complexPropertyThree;
-
- @Property
- protected Collection<ComplexPropertyBean> complexPropertyFour;
-
- @Property(name = "location")
- protected String location = "RTP";
-
- @Property(name = "year")
- protected String year = "2006";
-
- public String getLocation(){
- return location;
- }
-
- public String getYear(){
- return year;
- }
-
- public ComplexPropertyBean getComplexPropertyOne() {
- //System.out.println(complexPropertyOne);
- return complexPropertyOne;
- }
-
- public ComplexPropertyBean getComplexPropertyTwo() {
- //System.out.println(complexPropertyTwo);
- return complexPropertyTwo;
- }
-
- public ComplexPropertyBean getComplexPropertyThree() {
- //System.out.println(complexPropertyThree);
- return complexPropertyThree;
- }
-
- public Collection<ComplexPropertyBean> getComplexPropertyFour() {
- //System.out.println(complexPropertyThree);
- return complexPropertyFour;
- }
-
- public DataObject getSdoProperty() {
- return sdoProperty;
- }
-
- public void setSdoProperty(DataObject sdoProperty) {
- System.out.println("Reached here da machi");
- this.sdoProperty = sdoProperty;
- }
-
- public CustomerImpl getCustomerSdo() {
- return customerSdo;
- }
-
- public void setCustomerSdo(CustomerImpl customerSdo) {
- this.customerSdo = customerSdo;
- }
-}
+/*
+ * 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.itest;
+
+import java.util.Collection;
+
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Property;
+
+import com.example.customer.sdo.impl.CustomerImpl;
+import commonj.sdo.DataObject;
+
+public class PropertyComponentImpl implements PropertyComponent {
+
+ @Context
+ protected ComponentContext context;
+
+ @Property
+ protected CustomerImpl customerSdo;
+
+ @Property
+ protected DataObject sdoProperty;
+
+ @Property
+ protected ComplexPropertyBean complexPropertyOne;
+
+ @Property
+ protected ComplexPropertyBean complexPropertyTwo;
+
+ @Property
+ protected ComplexPropertyBean complexPropertyThree;
+
+ @Property
+ protected Collection<ComplexPropertyBean> complexPropertyFour;
+
+ @Property(name = "location")
+ protected String location;
+
+ @Property(name = "year")
+ protected String year;
+
+ @Property(name = "daysOfTheWeek")
+ protected String[] daysOfTheWeek;
+
+ @Property(name = "integerNumbers")
+ protected Integer[] integerNumbers;
+
+ @Property(name = "intNumbers")
+ protected int[] intNumbers;
+
+ @Property(name = "sdoArray")
+ protected DataObject[] sdoArray;
+
+ public String getLocation(){
+ return location;
+ }
+
+ public String getLocationFromComponentContext() {
+ return context.getProperty(String.class, "location");
+ }
+
+ public String getYear(){
+ return year;
+ }
+
+ public ComplexPropertyBean getComplexPropertyOne() {
+ //System.out.println(complexPropertyOne);
+ return complexPropertyOne;
+ }
+
+ public ComplexPropertyBean getComplexPropertyTwo() {
+ //System.out.println(complexPropertyTwo);
+ return complexPropertyTwo;
+ }
+
+ public ComplexPropertyBean getComplexPropertyThree() {
+ //System.out.println(complexPropertyThree);
+ return complexPropertyThree;
+ }
+
+ public Collection<ComplexPropertyBean> getComplexPropertyFour() {
+ //System.out.println(complexPropertyThree);
+ return complexPropertyFour;
+ }
+
+ public DataObject getSdoProperty() {
+ return sdoProperty;
+ }
+
+ public void setSdoProperty(DataObject sdoProperty) {
+ System.out.println("Reached here da machi");
+ this.sdoProperty = sdoProperty;
+ }
+
+ public CustomerImpl getCustomerSdo() {
+ return customerSdo;
+ }
+
+ public void setCustomerSdo(CustomerImpl customerSdo) {
+ this.customerSdo = customerSdo;
+ }
+
+ /**
+ * This method is used to test injecting an Array
+ * @return The injected array
+ */
+ public String[] getDaysOfTheWeek() {
+ return daysOfTheWeek;
+ }
+
+ /**
+ * This method is used to test injecting an Object Integer Array
+ * @return The injected array
+ */
+ public Integer[] getIntegerNumbers() {
+ return integerNumbers;
+ }
+
+ /**
+ * This method is used to test injecting an int Array
+ * @return The injected array
+ */
+ public int[] getIntNumbers() {
+ return intNumbers;
+ }
+
+ /**
+ * This method is used to test injecting an Object Array
+ * @return The injected array
+ */
+ public DataObject[] getSdoArrayProperty() {
+ return sdoArray;
+ }
+}
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/resources/PropertyTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/resources/PropertyTest.composite?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/resources/PropertyTest.composite (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/main/resources/PropertyTest.composite Tue Oct 23 21:30:02 2007
@@ -209,6 +209,29 @@
<cust:lastName>Sdo Lasting Name</cust:lastName>
</cust:customer>
</property>
+ <property name="location" type="xsd:string">RTP</property>
+ <property name="year" type="xsd:string">2006</property>
+ <property name="daysOfTheWeek" many="true" type="xsd:string">"Monday" "Tuesday" "Wednesday" "Thursday" "Friday" "Saturday" "Sunday"</property>
+ <property name="integerNumbers" many="true" type="xsd:int">1 2 3 4 5 6 7 8 9 10</property>
+ <property name="intNumbers" many="true" type="xsd:int">10 9 8 7 6 5 4 3 2 1 0</property>
+ <property name="sdoArray" many="true" type="cust:Customer">
+ <cust:customer>
+ <cust:firstName>Firstly Name 1</cust:firstName>
+ <cust:middleName>Middler Name 1</cust:middleName>
+ <cust:lastName>Lasting Name 1</cust:lastName>
+ </cust:customer>
+ <cust:customer>
+ <cust:firstName>Firstly Name 2</cust:firstName>
+ <cust:middleName>Middler Name 2</cust:middleName>
+ <cust:lastName>Lasting Name 2</cust:lastName>
+ </cust:customer>
+ <cust:customer>
+ <cust:firstName>Firstly Name 3</cust:firstName>
+ <cust:middleName>Middler Name 3</cust:middleName>
+ <cust:lastName>Lasting Name 3</cust:lastName>
+ </cust:customer>
+ </property>
</component>
</composite>
+
Modified: incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java Tue Oct 23 21:30:02 2007
@@ -22,8 +22,11 @@
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
+import java.util.Arrays;
import java.util.Iterator;
+import junit.framework.Assert;
+
import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -188,7 +191,62 @@
assertEquals("Sdo Middler Name", dataObject.getString("middleName"));
assertEquals("Sdo Lasting Name", dataObject.getString("lastName"));
}
+
+ @Test
+ public void testGetLocationFromComponentContext() {
+ String location = propertyService.getLocation();
+ assertNotNull(location);
+ String locationFromCC = propertyService.getLocationFromComponentContext();
+ assertNotNull(locationFromCC);
+ assertEquals(location, locationFromCC);
+ }
+
+ @Test
+ public void testGetInjectedStringArrayProperty()
+ {
+ String[] daysOfWeek = propertyService.getDaysOfTheWeek();
+ assertNotNull(daysOfWeek);
+ String[] expected = {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"};
+ Assert.assertTrue(Arrays.equals(expected, daysOfWeek));
+ }
+
+ @Test
+ public void testGetInjectedIntegerArrayProperty()
+ {
+ Integer[] numbers = propertyService.getIntegerNumbers();
+ assertNotNull(numbers);
+
+ Integer[] expected = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
+ Assert.assertTrue(Arrays.equals(expected, numbers));
+ }
+
+ @Test
+ public void testGetInjectedIntArrayProperty()
+ {
+ int[] numbers = propertyService.getIntNumbers();
+ assertNotNull(numbers);
+
+ int[] expected = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0};
+ Assert.assertTrue(Arrays.equals(expected, numbers));
+ }
+
+
+ @Test
+ public void testGetInjectedSdoArrayProperty()
+ {
+ DataObject[] sdos = propertyService.getSdoArrayProperty();
+ assertNotNull(sdos);
+
+ for (int i = 1; i <= 3; i++) {
+ DataObject dataObject = sdos[i - 1];
+ assertEquals("Firstly Name " + i, dataObject.get("firstName"));
+ assertEquals("Middler Name " + i, dataObject.getString("middleName"));
+ assertEquals("Lasting Name " + i, dataObject.getString("lastName"));
+ }
+ }
+
+
@BeforeClass
public static void init() throws Exception {
try {
Propchange: incubator/tuscany/branches/sca-java-1.0.1/itest/wires/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 23 21:30:02 2007
@@ -0,0 +1,13 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
Copied: incubator/tuscany/branches/sca-java-1.0.1/itest/wires/pom.xml (from r587600, incubator/tuscany/java/sca/itest/wires/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/itest/wires/pom.xml?p2=incubator/tuscany/branches/sca-java-1.0.1/itest/wires/pom.xml&p1=incubator/tuscany/java/sca/itest/wires/pom.xml&r1=587600&r2=587778&rev=587778&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/wires/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/itest/wires/pom.xml Tue Oct 23 21:30:02 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>itest-wires</artifactId>
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/pom.xml?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/pom.xml Tue Oct 23 21:30:02 2007
@@ -37,6 +37,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-definitions-xml</artifactId>
+ <version>1.0.1-incubating-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-definitions</artifactId>
<version>1.0.1-incubating-SNAPSHOT</version>
<scope>test</scope>
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java Tue Oct 23 21:30:02 2007
@@ -27,12 +27,10 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.validation.Schema;
import org.apache.tuscany.sca.assembly.ComponentType;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ValidatingXMLStreamReader;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
@@ -44,7 +42,6 @@
*/
public class ComponentTypeDocumentProcessor extends BaseAssemblyProcessor implements URLArtifactProcessor<ComponentType> {
private XMLInputFactory inputFactory;
- private Schema schema;
/**
* Constructs a new componentType processor.
@@ -52,10 +49,9 @@
* @param policyFactory
* @param registry
*/
- public ComponentTypeDocumentProcessor(StAXArtifactProcessor staxProcessor, XMLInputFactory inputFactory, Schema schema) {
+ public ComponentTypeDocumentProcessor(StAXArtifactProcessor staxProcessor, XMLInputFactory inputFactory) {
super(null, null, staxProcessor);
this.inputFactory = inputFactory;
- this.schema = schema;
}
public ComponentType read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
@@ -65,7 +61,6 @@
// Create a stream reader
urlStream = url.openStream();
XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream);
- reader = new ValidatingXMLStreamReader(reader, schema);
reader.nextTag();
// Reader the componentType model
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java Tue Oct 23 21:30:02 2007
@@ -27,12 +27,10 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.validation.Schema;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ValidatingXMLStreamReader;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
@@ -44,7 +42,6 @@
*/
public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements URLArtifactProcessor<Composite> {
private XMLInputFactory inputFactory;
- private Schema schema;
/**
* Construct a new composite processor
@@ -52,10 +49,9 @@
* @param policyFactory
* @param staxProcessor
*/
- public CompositeDocumentProcessor(StAXArtifactProcessor staxProcessor, XMLInputFactory inputFactory, Schema schema) {
+ public CompositeDocumentProcessor(StAXArtifactProcessor staxProcessor, XMLInputFactory inputFactory) {
super(null, null, staxProcessor);
this.inputFactory = inputFactory;
- this.schema = schema;
}
public Composite read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
@@ -65,7 +61,6 @@
// Create a stream reader
urlStream = url.openStream();
XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream);
- reader = new ValidatingXMLStreamReader(reader, schema);
reader.nextTag();
// Read the composite model
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java Tue Oct 23 21:30:02 2007
@@ -47,7 +47,7 @@
QName COMPOSITE_QNAME = new QName(SCA10_NS, COMPOSITE);
String INCLUDE = "include";
- QName INCLUDE_QNAME = new QName(SCA10_NS, INCLUDE);
+ QName INCLUDE_QNAME = new QName(SCA10_NS, INCLUDE);
String COMPONENT = "component";
QName COMPONENT_QNAME = new QName(SCA10_NS, COMPONENT);
@@ -66,6 +66,9 @@
String IMPLEMENTATION = "implementation";
QName IMPLEMENTATION_QNAME = new QName(SCA10_NS, IMPLEMENTATION);
+
+ String BINDING_SCA = "binding.sca";
+ QName BINDING_SCA_QNAME = new QName(Constants.SCA10_NS, BINDING_SCA);
String NAME = "name";
String TARGET_NAMESPACE = "targetNamespace";
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java Tue Oct 23 21:30:02 2007
@@ -32,7 +32,6 @@
import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ValidatingXMLStreamReader;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
@@ -52,10 +51,9 @@
* @param policyFactory
* @param staxProcessor
*/
- public ConstrainingTypeDocumentProcessor(StAXArtifactProcessor staxProcessor, XMLInputFactory inputFactory, Schema schema) {
+ public ConstrainingTypeDocumentProcessor(StAXArtifactProcessor staxProcessor, XMLInputFactory inputFactory) {
super(null, null, staxProcessor);
this.inputFactory = inputFactory;
- this.schema = schema;
}
public ConstrainingType read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
@@ -65,7 +63,6 @@
// Create a stream reader
urlStream = url.openStream();
XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream);
- reader = new ValidatingXMLStreamReader(reader, schema);
reader.nextTag();
// Read the constrainingType model
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java Tue Oct 23 21:30:02 2007
@@ -42,10 +42,11 @@
import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.SCADefinitionsDocumentProcessor;
-import org.apache.tuscany.sca.definitions.SCADefinitionsProcessor;
+import org.apache.tuscany.sca.definitions.xml.SCADefinitionsDocumentProcessor;
+import org.apache.tuscany.sca.definitions.xml.SCADefinitionsProcessor;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
+import org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.IntentAttachPoint;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -73,11 +74,11 @@
PolicyFactory policyFactory = new DefaultPolicyFactory();
InterfaceContractMapper mapper = new InterfaceContractMapperImpl();
resolver = new TestModelResolver();
- compositeBuilder = new CompositeBuilderImpl(factory, new TestSCABindingFactoryImpl(), new InterfaceContractMapperImpl(), null, null);
+ compositeBuilder = new CompositeBuilderImpl(factory, new TestSCABindingFactoryImpl(), new DefaultIntentAttachPointTypeFactory(), new InterfaceContractMapperImpl(), null, null);
URLArtifactProcessorExtensionPoint documentProcessors = new DefaultURLArtifactProcessorExtensionPoint(new DefaultModelFactoryExtensionPoint());
documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors);
- // Create Stax processors
+ // Create Stax processors
DefaultStAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(new DefaultModelFactoryExtensionPoint());
ExtensibleStAXArtifactProcessor staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
staxProcessors.addArtifactProcessor(new CompositeProcessor(new ContributionFactoryImpl(), factory, policyFactory, mapper, staxProcessor));
@@ -93,10 +94,10 @@
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
// Create document processors
- documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory, null));
- documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory, null));
- documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory, null));
- scaDefnDocProcessor = new SCADefinitionsDocumentProcessor(staxProcessors, staxProcessor, inputFactory, policyFactory, null);
+ documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory));
+ documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory));
+ documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory));
+ scaDefnDocProcessor = new SCADefinitionsDocumentProcessor(staxProcessors, staxProcessor, inputFactory, policyFactory);
documentProcessors.addArtifactProcessor(scaDefnDocProcessor);
URL url = getClass().getResource("CalculatorComponent.constrainingType");
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java Tue Oct 23 21:30:02 2007
@@ -40,9 +40,12 @@
import org.apache.tuscany.sca.contribution.impl.ContributionFactoryImpl;
import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.DefaultURLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.DefaultValidatingXMLInputFactory;
+import org.apache.tuscany.sca.contribution.processor.DefaultValidationSchemaExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
@@ -79,9 +82,9 @@
staxProcessors.addArtifactProcessor(new ConstrainingTypeProcessor(factory, policyFactory, staxProcessor));
inputFactory = XMLInputFactory.newInstance();
- documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory, null));
- documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory, null));
- documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory, null));
+ documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory));
+ documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory));
+ documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory));
resolver = new TestModelResolver();
}
@@ -138,19 +141,10 @@
public void testReadImplementation() throws Exception {
- SchemaFactory schemaFactory;
- try {
- schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- } catch (Error e) {
- // Some old JDKs don't support XMLSchema validation
- return;
- } catch (Exception e) {
- // Some old JDKs don't support XMLSchema validation
- return;
- }
- Schema schema = schemaFactory.newSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd"));
-
- CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(staxProcessor, inputFactory, schema);
+ ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint();
+ schemas.addSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd").toString());
+ XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas);
+ CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(staxProcessor, validatingInputFactory);
URL url = getClass().getResource("JavaScriptReference.composite");
URI uri = URI.create("JavaScriptReference.composite");
@@ -183,19 +177,10 @@
public void testReadBinding() throws Exception {
- SchemaFactory schemaFactory;
- try {
- schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- } catch (Error e) {
- // Some old JDKs don't support XMLSchema validation
- return;
- } catch (Exception e) {
- // Some old JDKs don't support XMLSchema validation
- return;
- }
- Schema schema = schemaFactory.newSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd"));
-
- CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(staxProcessor, inputFactory, schema);
+ ValidationSchemaExtensionPoint schemas = new DefaultValidationSchemaExtensionPoint();
+ schemas.addSchema(getClass().getClassLoader().getResource("tuscany-sca.xsd").toString());
+ XMLInputFactory validatingInputFactory = new DefaultValidatingXMLInputFactory(inputFactory, schemas);
+ CompositeDocumentProcessor compositeDocumentProcessor = new CompositeDocumentProcessor(staxProcessor, validatingInputFactory);
URL url = getClass().getResource("RMIBindingTest.composite");
URI uri = URI.create("RMIBindingTest.composite");
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java Tue Oct 23 21:30:02 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.assembly.xml;
+package org.apache.tuscany.sca.assembly.xml;
import java.net.URI;
import java.net.URL;
@@ -39,8 +39,8 @@
import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.SCADefinitionsDocumentProcessor;
-import org.apache.tuscany.sca.definitions.SCADefinitionsProcessor;
+import org.apache.tuscany.sca.definitions.xml.SCADefinitionsDocumentProcessor;
+import org.apache.tuscany.sca.definitions.xml.SCADefinitionsProcessor;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
@@ -87,10 +87,10 @@
// Create document processors
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
- documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory, null));
- documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory, null));
- documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory, null));
- scaDefnDocProcessor = new SCADefinitionsDocumentProcessor(staxProcessors, staxProcessor, inputFactory, policyFactory, null);
+ documentProcessors.addArtifactProcessor(new CompositeDocumentProcessor(staxProcessor, inputFactory));
+ documentProcessors.addArtifactProcessor(new ComponentTypeDocumentProcessor(staxProcessor, inputFactory));
+ documentProcessors.addArtifactProcessor(new ConstrainingTypeDocumentProcessor(staxProcessor, inputFactory));
+ scaDefnDocProcessor = new SCADefinitionsDocumentProcessor(staxProcessors, staxProcessor, inputFactory, policyFactory);
documentProcessors.addArtifactProcessor(scaDefnDocProcessor);
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java Tue Oct 23 21:30:02 2007
@@ -26,8 +26,8 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.OptimizableBinding;
+import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
import org.apache.tuscany.sca.policy.PolicySet;
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java Tue Oct 23 21:30:02 2007
@@ -39,6 +39,7 @@
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
+import org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -91,7 +92,7 @@
assertNotNull(composite);
compositeReader.resolve(composite, resolver);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
compositeUtil.build(composite);
assertEquals(composite.getConstrainingType(), constrainingType);
@@ -114,7 +115,7 @@
is.close();
compositeReader.resolve(composite, resolver);
- CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, mapper, null, null);
+ CompositeBuilderImpl compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
compositeUtil.build(composite);
assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java Tue Oct 23 21:30:02 2007
@@ -42,6 +42,7 @@
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
+import org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -67,7 +68,7 @@
scaBindingFactory = new TestSCABindingFactoryImpl();
policyFactory = new DefaultPolicyFactory();
mapper = new InterfaceContractMapperImpl();
- compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, mapper, null, null);
+ compositeUtil = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, new DefaultIntentAttachPointTypeFactory(), mapper, null, null);
staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(new DefaultModelFactoryExtensionPoint());
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
staxProcessors.addArtifactProcessor(new CompositeProcessor(new ContributionFactoryImpl(), assemblyFactory, policyFactory, mapper, staxProcessor));
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite Tue Oct 23 21:30:02 2007
@@ -70,7 +70,7 @@
<property name="round" type="xsd:boolean" many="false">true</property>
- <implementation.java class="calculator.CalculatorServiceImpl" policySets="" requires="" />
+ <implementation.java class="calculator.CalculatorServiceImpl" policySets="" requires="cns:tuscanyIntent_4" />
</component>
<component name="AddServiceComponent">
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd Tue Oct 23 21:30:02 2007
@@ -20,7 +20,7 @@
<schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0">
- <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="tuscany-sca-include.xsd"/>
+ <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-all.xsd"/>
<include schemaLocation="tuscany-sca-binding-atom.xsd"/>
<include schemaLocation="tuscany-sca-binding-dwr.xsd"/>
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java Tue Oct 23 21:30:02 2007
@@ -47,14 +47,14 @@
/**
* Returns the default value of the property.
*
- * @return the default value of ths property
+ * @return the default value of this property
*/
Object getValue();
/**
* Sets the default value of the property.
*
- * @param defaultValue the default value of ths property
+ * @param defaultValue the default value of this property
*/
void setValue(Object defaultValue);
@@ -115,7 +115,7 @@
* Sets the element defining the data type of this property. This is the
* qualified name of an XML schema element.
*
- * @param type the element defining the type of this property
+ * @param element the element defining the type of this property
*/
void setXSDElement(QName element);
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java Tue Oct 23 21:30:02 2007
@@ -25,8 +25,8 @@
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.OptimizableBinding;
+import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
@@ -35,17 +35,24 @@
*/
class BindingUtil {
private static boolean hasCompatiblePolicySets(Binding refBinding, Binding svcBinding) {
+ boolean isCompatible = true;;
if ( refBinding instanceof PolicySetAttachPoint && svcBinding instanceof PolicySetAttachPoint ) {
//TODO : need to add more compatibility checks at the policy attachment levels
for ( PolicySet svcPolicySet : ((PolicySetAttachPoint)svcBinding).getPolicySets() ) {
+ isCompatible = false;
for ( PolicySet refPolicySet : ((PolicySetAttachPoint)refBinding).getPolicySets() ) {
- if ( !svcPolicySet.equals(refPolicySet) ) {
- return false;
+ if ( svcPolicySet.equals(refPolicySet) ) {
+ isCompatible = true;
+ break;
}
}
+ //if there exists no matching policy set in the reference binding
+ if ( !isCompatible ) {
+ return isCompatible;
+ }
}
}
- return true;
+ return isCompatible;
}
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java Tue Oct 23 21:30:02 2007
@@ -30,6 +30,7 @@
import org.apache.tuscany.sca.assembly.builder.Problem;
import org.apache.tuscany.sca.assembly.builder.Problem.Severity;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
+import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
import org.apache.tuscany.sca.policy.PolicySet;
/**
@@ -53,6 +54,7 @@
*/
public CompositeBuilderImpl(AssemblyFactory assemblyFactory,
SCABindingFactory scaBindingFactory,
+ IntentAttachPointTypeFactory intentAttachPointTypeFactory,
InterfaceContractMapper interfaceContractMapper,
List<PolicySet> domainPolicySets,
CompositeBuilderMonitor monitor) {
@@ -75,7 +77,7 @@
includeBuilder = new CompositeIncludeBuilderImpl(monitor);
wireBuilder = new CompositeWireBuilderImpl(assemblyFactory, interfaceContractMapper, domainPolicySets, monitor);
cloneBuilder = new CompositeCloneBuilderImpl(monitor);
- configurationBuilder = new CompositeConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, interfaceContractMapper, monitor);
+ configurationBuilder = new CompositeConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, intentAttachPointTypeFactory, interfaceContractMapper, monitor);
}
public void build(Composite composite) throws CompositeBuilderException {
Modified: incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java?rev=587778&r1=587777&r2=587778&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java Tue Oct 23 21:30:02 2007
@@ -24,6 +24,8 @@
import java.util.List;
import java.util.Map;
+import javax.xml.namespace.QName;
+
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Component;
@@ -43,21 +45,30 @@
import org.apache.tuscany.sca.assembly.builder.Problem.Severity;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
public class CompositeConfigurationBuilderImpl {
+ String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+ String BINDING_SCA = "binding.sca";
+ QName BINDING_SCA_QNAME = new QName(SCA10_NS, BINDING_SCA);
private AssemblyFactory assemblyFactory;
private SCABindingFactory scaBindingFactory;
private CompositeBuilderMonitor monitor;
private InterfaceContractMapper interfaceContractMapper;
+ private IntentAttachPointTypeFactory intentAttachPointTypeFactory;
public CompositeConfigurationBuilderImpl(AssemblyFactory assemblyFactory,
SCABindingFactory scaBindingFactory,
+ IntentAttachPointTypeFactory intentAttachPointTypeFactory,
InterfaceContractMapper interfaceContractMapper,
CompositeBuilderMonitor monitor) {
this.assemblyFactory = assemblyFactory;
this.scaBindingFactory = scaBindingFactory;
+ this.intentAttachPointTypeFactory = intentAttachPointTypeFactory;
this.interfaceContractMapper = interfaceContractMapper;
this.monitor = monitor;
}
@@ -110,7 +121,9 @@
// Create default SCA binding
if (service.getBindings().isEmpty()) {
- SCABinding scaBinding = scaBindingFactory.createSCABinding();
+ SCABinding scaBinding = createSCABinding();
+
+
service.getBindings().add(scaBinding);
}
@@ -163,7 +176,7 @@
for (Reference reference : composite.getReferences()) {
// Create default SCA binding
if (reference.getBindings().isEmpty()) {
- SCABinding scaBinding = scaBindingFactory.createSCABinding();
+ SCABinding scaBinding = createSCABinding();
reference.getBindings().add(scaBinding);
}
@@ -253,7 +266,7 @@
// Create default SCA binding
if (componentService.getBindings().isEmpty()) {
- SCABinding scaBinding = scaBindingFactory.createSCABinding();
+ SCABinding scaBinding = createSCABinding();
componentService.getBindings().add(scaBinding);
}
@@ -298,7 +311,7 @@
// Create default SCA binding
if (componentReference.getBindings().isEmpty()) {
- SCABinding scaBinding = scaBindingFactory.createSCABinding();
+ SCABinding scaBinding = createSCABinding();
componentReference.getBindings().add(scaBinding);
}
@@ -1061,5 +1074,16 @@
}
return null;
}
+
+ private SCABinding createSCABinding() {
+ SCABinding scaBinding = scaBindingFactory.createSCABinding();
+ IntentAttachPointType bindingType = intentAttachPointTypeFactory.createBindingType();
+ bindingType.setName(BINDING_SCA_QNAME);
+ bindingType.setUnresolved(true);
+ ((PolicySetAttachPoint)scaBinding).setType(bindingType);
+
+ return scaBinding;
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org