You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/03/21 08:54:31 UTC

svn commit: r520787 - in /incubator/tuscany/sandbox/sebastien/java/sca: ./ assembly-builder/ assembly-builder/src/ assembly-builder/src/main/ assembly-builder/src/main/java/ assembly-builder/src/main/java/org/ assembly-builder/src/main/java/org/apache/...

Author: jsdelfino
Date: Wed Mar 21 00:54:29 2007
New Revision: 520787

URL: http://svn.apache.org/viewvc?view=rev&rev=520787
Log:
Refactored scdl module and created a new assembly builder module.

Added:
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/pom.xml   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/AssemblyBuilder.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentBuilder.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentPropertyBuilder.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentReferenceBuilder.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentServiceBuilder.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilder.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/resources/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataService.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataServiceImpl.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountService.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountServiceImpl.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilder.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/StockQuoteService.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/util/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/util/PrintUtil.java   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/Calculator.composite   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorComponent.constrainingType
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorImpl.componentType   (with props)
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-scdl/
      - copied from r520731, incubator/tuscany/sandbox/sebastien/java/sca/scdl/
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-scdl/pom.xml
      - copied, changed from r520786, incubator/tuscany/sandbox/sebastien/java/sca/scdl/pom.xml
    incubator/tuscany/sandbox/sebastien/java/sca/assembly-scdl/src/
      - copied from r520786, incubator/tuscany/sandbox/sebastien/java/sca/scdl/src/
Removed:
    incubator/tuscany/sandbox/sebastien/java/sca/scdl/
Modified:
    incubator/tuscany/sandbox/sebastien/java/sca/pom.xml

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 21 00:54:29 2007
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/pom.xml?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/pom.xml (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/pom.xml Wed Mar 21 00:54:29 2007
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.1-sandbox-incubating-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tuscany-assembly-builder</artifactId>
+    <packaging>jar</packaging>
+    <name>Apache Tuscany SCA Assembly model Helper</name>
+    <description>Apache Tuscany SCA Assembly model Helper</description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>0.1-sandbox-incubating-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+		
+    </dependencies>
+</project>

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/AssemblyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/AssemblyBuilder.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/AssemblyBuilder.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/AssemblyBuilder.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,42 @@
+/*
+ * 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.assembly.builder;
+
+import org.apache.tuscany.assembly.builder.ComponentBuilder;
+import org.apache.tuscany.assembly.builder.ComponentPropertyBuilder;
+import org.apache.tuscany.assembly.builder.ComponentReferenceBuilder;
+import org.apache.tuscany.assembly.builder.ComponentServiceBuilder;
+import org.apache.tuscany.assembly.builder.CompositeBuilder;
+
+public interface AssemblyBuilder {
+	
+	CompositeBuilder composite(String name);
+	
+	ComponentBuilder component(String name);
+	
+	ComponentReferenceBuilder reference(String name);
+
+	ComponentServiceBuilder service(String name);
+	
+	ComponentPropertyBuilder property(String name);
+	
+	CompositeBuilder domain(String uri);
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/AssemblyBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/AssemblyBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentBuilder.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentBuilder.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentBuilder.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,34 @@
+/*
+ * 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.assembly.builder;
+
+public interface ComponentBuilder {
+
+	ComponentBuilder implementedBy(Class clazz);
+	
+	ComponentBuilder implementedBy(CompositeBuilder composite);
+	
+	public ComponentBuilder uses(ComponentReferenceBuilder... componentReferences);
+
+	public ComponentBuilder provides(ComponentServiceBuilder... componentServices);
+	
+	public ComponentBuilder declares(ComponentPropertyBuilder...componentProperties);
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentPropertyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentPropertyBuilder.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentPropertyBuilder.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentPropertyBuilder.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.assembly.builder;
+
+public interface ComponentPropertyBuilder {
+	
+	ComponentPropertyBuilder ofType(String type);
+	
+	ComponentPropertyBuilder configuredTo(Object value);
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentPropertyBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentPropertyBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentReferenceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentReferenceBuilder.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentReferenceBuilder.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentReferenceBuilder.java Wed Mar 21 00:54:29 2007
@@ -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.assembly.builder;
+
+public interface ComponentReferenceBuilder {
+	
+	ComponentReferenceBuilder wiredTo(String target);
+	
+	ComponentReferenceBuilder definedBy(Class interfaceClass);
+	
+	ComponentReferenceBuilder promotedAs(String promoted);
+
+	ComponentReferenceBuilder promoted();
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentReferenceBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentReferenceBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentServiceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentServiceBuilder.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentServiceBuilder.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentServiceBuilder.java Wed Mar 21 00:54:29 2007
@@ -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.assembly.builder;
+
+public interface ComponentServiceBuilder {
+	
+	ComponentServiceBuilder definedBy(Class interfaceClass);
+	
+	ComponentServiceBuilder promotedAs(String promoted);
+	
+	ComponentServiceBuilder promoted();
+	
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentServiceBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/ComponentServiceBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilder.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilder.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilder.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.assembly.builder;
+
+public interface CompositeBuilder {
+	
+	CompositeBuilder contains(ComponentBuilder... components);
+	
+	CompositeBuilder includes(CompositeBuilder... includes);
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/CompositeBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,52 @@
+package org.apache.tuscany.assembly.builder.impl;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.assembly.builder.AssemblyBuilder;
+import org.apache.tuscany.assembly.builder.ComponentBuilder;
+import org.apache.tuscany.assembly.builder.ComponentPropertyBuilder;
+import org.apache.tuscany.assembly.builder.ComponentReferenceBuilder;
+import org.apache.tuscany.assembly.builder.ComponentServiceBuilder;
+import org.apache.tuscany.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.assembly.model.impl.AssemblyFactoryImpl;
+
+public class AssemblyBuilderImpl extends AssemblyFactoryImpl implements AssemblyBuilder {
+
+	public ComponentBuilder component(String name) {
+		ComponentBuilderImpl component = new ComponentBuilderImpl();
+		component.setName(name);
+		return component;
+	}
+
+	public CompositeBuilder composite(String name) {
+		CompositeBuilderImpl composite = new CompositeBuilderImpl();
+		//TODO handle namespace
+		composite.setName(new QName("", name));
+		return composite;
+	}
+
+	public CompositeBuilder domain(String uri) {
+		CompositeBuilderImpl composite = new CompositeBuilderImpl();
+		composite.setName(new QName(uri, ""));
+		return composite;
+	}
+
+	public ComponentPropertyBuilder property(String name) {
+		ComponentPropertyBuilderImpl property = new ComponentPropertyBuilderImpl();
+		property.setName(name);
+		return property;
+	}
+
+	public ComponentReferenceBuilder reference(String name) {
+		ComponentReferenceBuilderImpl reference = new ComponentReferenceBuilderImpl();
+		reference.setName(name);
+		return reference;
+	}
+
+	public ComponentServiceBuilder service(String name) {
+		ComponentServiceBuilderImpl service = new ComponentServiceBuilderImpl();
+		service.setName(name);
+		return service;
+	}
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,74 @@
+/*
+ * 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.assembly.builder.impl;
+
+import java.util.List;
+
+import org.apache.tuscany.assembly.builder.ComponentBuilder;
+import org.apache.tuscany.assembly.builder.ComponentPropertyBuilder;
+import org.apache.tuscany.assembly.builder.ComponentReferenceBuilder;
+import org.apache.tuscany.assembly.builder.ComponentServiceBuilder;
+import org.apache.tuscany.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.assembly.model.ComponentProperty;
+import org.apache.tuscany.assembly.model.ComponentReference;
+import org.apache.tuscany.assembly.model.ComponentService;
+import org.apache.tuscany.assembly.model.Composite;
+import org.apache.tuscany.assembly.model.impl.ComponentImpl;
+
+public class ComponentBuilderImpl extends ComponentImpl implements ComponentBuilder {
+	
+	public ComponentBuilderImpl() {
+	}
+	
+	public ComponentBuilder implementedBy(Class clazz) {
+		//FIXME support Java implementations
+		return this;
+	}
+	
+	public ComponentBuilder implementedBy(CompositeBuilder composite) {
+		setImplementation((Composite)composite);
+		return this;
+	}
+	
+	public ComponentBuilder uses(ComponentReferenceBuilder... componentReferences) {
+		List<ComponentReference> references = getReferences();
+		for (ComponentReferenceBuilder componentReference: componentReferences) {
+			references.add((ComponentReference)componentReference);
+		}
+		return this;
+	}
+
+	public ComponentBuilder provides(ComponentServiceBuilder... componentServices) {
+		List<ComponentService> services = getServices();
+		for (ComponentServiceBuilder componentService: componentServices) {
+			services.add((ComponentService)componentService);
+		}
+		return this;
+	}
+	
+	public ComponentBuilder declares(ComponentPropertyBuilder...componentProperties) {
+		List<ComponentProperty> properties = getProperties();
+		for (ComponentPropertyBuilder componentProperty: componentProperties) {
+			properties.add((ComponentProperty)componentProperty);
+		}
+		return this;
+	}
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,41 @@
+/*
+ * 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.assembly.builder.impl;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.assembly.builder.ComponentPropertyBuilder;
+import org.apache.tuscany.assembly.model.impl.ComponentPropertyImpl;
+
+public class ComponentPropertyBuilderImpl extends ComponentPropertyImpl implements ComponentPropertyBuilder {
+	
+	public ComponentPropertyBuilderImpl ofType(String type) {
+		//TODO handle namespace
+		this.setXSDType(new QName("", type));
+		return this;
+	}
+	
+	public ComponentPropertyBuilderImpl configuredTo(Object value) {
+		//TODO set the value instead
+		this.setDefaultValue(value);
+		return this;
+	}
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,61 @@
+/*
+ * 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.assembly.builder.impl;
+
+import org.apache.tuscany.assembly.builder.ComponentReferenceBuilder;
+import org.apache.tuscany.assembly.model.ComponentService;
+import org.apache.tuscany.assembly.model.CompositeReference;
+import org.apache.tuscany.assembly.model.impl.ComponentReferenceImpl;
+import org.apache.tuscany.assembly.model.impl.ComponentServiceImpl;
+import org.apache.tuscany.assembly.model.impl.CompositeReferenceImpl;
+
+public class ComponentReferenceBuilderImpl extends ComponentReferenceImpl implements ComponentReferenceBuilder {
+	
+	private CompositeReference compositeReference;
+	
+	public ComponentReferenceBuilder wiredTo(String target) {
+		ComponentService componentService = new ComponentServiceImpl();
+		componentService.setUndefined(true);
+		componentService.setName(target);
+		getTargets().add(componentService);
+		return this;
+	}
+	
+	public ComponentReferenceBuilderImpl definedBy(Class interfaceClass) {
+		//FIXME support for Java interfaces 
+		return this;
+	}
+	
+	public ComponentReferenceBuilderImpl promotedAs(String promoted) {
+		compositeReference = new CompositeReferenceImpl();
+		compositeReference.setName(promoted);
+		return this;
+	}
+
+	public ComponentReferenceBuilderImpl promoted() {
+		compositeReference = new CompositeReferenceImpl();
+		compositeReference.setName(getName());
+		return this;
+	}
+
+	public CompositeReference getCompositeReference() {
+		return compositeReference;
+	}
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,52 @@
+/*
+ * 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.assembly.builder.impl;
+
+import org.apache.tuscany.assembly.builder.ComponentServiceBuilder;
+import org.apache.tuscany.assembly.model.CompositeService;
+import org.apache.tuscany.assembly.model.impl.ComponentServiceImpl;
+import org.apache.tuscany.assembly.model.impl.CompositeServiceImpl;
+
+public class ComponentServiceBuilderImpl extends ComponentServiceImpl implements ComponentServiceBuilder {
+	
+	private CompositeService compositeService;
+	
+	public ComponentServiceBuilderImpl definedBy(Class interfaceClass) {
+		//FIXME support for Java interfaces 
+		return this;
+	}
+	
+	public ComponentServiceBuilderImpl promotedAs(String promoted) {
+		compositeService = new CompositeServiceImpl();
+		compositeService.setName(promoted);
+		return this;
+	}
+
+	public ComponentServiceBuilderImpl promoted() {
+		compositeService = new CompositeServiceImpl();
+		compositeService.setName(getName());
+		return this;
+	}
+	
+	public CompositeService getCompositeService() {
+		return compositeService;
+	}
+	
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java Wed Mar 21 00:54:29 2007
@@ -0,0 +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.assembly.builder.impl;
+
+import java.util.List;
+
+import org.apache.tuscany.assembly.builder.ComponentBuilder;
+import org.apache.tuscany.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.assembly.model.Component;
+import org.apache.tuscany.assembly.model.ComponentReference;
+import org.apache.tuscany.assembly.model.ComponentService;
+import org.apache.tuscany.assembly.model.Composite;
+import org.apache.tuscany.assembly.model.impl.CompositeImpl;
+
+public class CompositeBuilderImpl extends CompositeImpl implements CompositeBuilder {
+	
+	public CompositeBuilder contains(ComponentBuilder... componentBuilders) {
+		List<Component> components = getComponents();
+		for (ComponentBuilder componentBuilder: componentBuilders) {
+			Component component = (Component)componentBuilder;
+			components.add(component);
+
+			for (ComponentService componentService: component.getServices()) {
+				ComponentServiceBuilderImpl builder = (ComponentServiceBuilderImpl)componentService;
+				if (builder.getCompositeService() != null)
+					getServices().add(builder.getCompositeService());
+			}
+			for (ComponentReference componentReference: component.getReferences()) {
+				ComponentReferenceBuilderImpl builder = (ComponentReferenceBuilderImpl)componentReference;
+				if (builder.getCompositeReference() != null)
+					getReferences().add(builder.getCompositeReference());
+			}
+		}
+		return this;
+	}
+	
+	public CompositeBuilder includes(CompositeBuilder... compositeBuilders) {
+		List<Composite> list = getIncludes();
+		for (CompositeBuilder composite: compositeBuilders) {
+			list.add((Composite)composite);
+		}
+		return this;
+	}
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataService.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataService.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataService.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,24 @@
+/*
+ * 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.assembly.builder;
+
+public interface AccountDataService {
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataServiceImpl.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataServiceImpl.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataServiceImpl.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,24 @@
+/*
+ * 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.assembly.builder;
+
+public class AccountDataServiceImpl {
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountDataServiceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountService.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountService.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountService.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,24 @@
+/*
+ * 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.assembly.builder;
+
+public interface AccountService {
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountServiceImpl.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountServiceImpl.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountServiceImpl.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,24 @@
+/*
+ * 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.assembly.builder;
+
+public class AccountServiceImpl {
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/AccountServiceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilder.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilder.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilder.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,59 @@
+/*
+ * 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.assembly.builder;
+
+import org.apache.tuscany.assembly.builder.impl.AssemblyBuilderImpl;
+
+public class BigBankBuilder extends AssemblyBuilderImpl {
+	
+	public CompositeBuilder build() {
+		
+		CompositeBuilder bigbankAccount = composite("bigbank.account").contains(
+
+			component("AccountServiceComponent").
+			implementedBy(AccountServiceImpl.class).
+			uses(
+				reference("accountDataService").definedBy(AccountDataService.class).wiredTo("AccountDataServiceComponent/AccountDataService"),
+				reference("stockQuoteService").promotedAs("StockQuoteService")
+			).
+			provides(
+				service("AccountDataService").definedBy(AccountService.class).promoted()
+			).
+			declares(
+				property("currency").ofType("string").configuredTo("USD")
+			),
+		
+			component("AccountDataServiceComponent").
+			implementedBy(AccountDataServiceImpl.class).
+			provides(
+				service("AccountDataService").definedBy(AccountDataService.class)
+			)
+		);
+		
+		CompositeBuilder bigbankApp = composite("bigbank.app").
+			contains(
+				component("BigBankAccount").implementedBy(bigbankAccount)
+			);
+		
+		CompositeBuilder domain = domain("http://bigbank.org").includes(bigbankApp);
+		
+		return domain;
+	}
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,39 @@
+/*
+ * 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.assembly.builder;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.assembly.builder.util.PrintUtil;
+
+public class BigBankBuilderTestCase extends TestCase {
+	
+	public void testBuild() throws Exception {
+
+		BigBankBuilder builder = new BigBankBuilder();
+		CompositeBuilder domain = builder.build();
+		
+		System.out.println();
+		new PrintUtil(System.out).print(domain);
+		System.out.println();
+		
+	}
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/StockQuoteService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/StockQuoteService.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/StockQuoteService.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/StockQuoteService.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,24 @@
+/*
+ * 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.assembly.builder;
+
+public interface StockQuoteService {
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/StockQuoteService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/StockQuoteService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/util/PrintUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/util/PrintUtil.java?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/util/PrintUtil.java (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/util/PrintUtil.java Wed Mar 21 00:54:29 2007
@@ -0,0 +1,114 @@
+/*
+ * 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.assembly.builder.util;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * A simple print utility class to help print the assembly model.
+ *
+ *  @version $Rev$ $Date$
+ */
+public class PrintUtil {
+	
+	PrintWriter out;
+	Set<Object> objs = new HashSet<Object>();
+	int level;
+	
+	public PrintUtil(OutputStream out) {
+		this.out = new PrintWriter(new OutputStreamWriter(out), true);
+	}
+	
+	void indent(int level) {
+		for (int i=0; i<level; i++) {
+			out.print("  ");
+		}
+	}
+	
+	public void print(Object obj) {
+		if (objs.contains(obj)) {
+			indent(level);
+			out.println(obj.getClass().getName()+"@"+System.identityHashCode(obj));
+		}
+		else {
+			objs.add(obj);
+			try {
+				indent(level);
+				out.println(obj.getClass().getSimpleName() + " {");
+				BeanInfo bi = Introspector.getBeanInfo(obj.getClass());
+				for (PropertyDescriptor pd: bi.getPropertyDescriptors()) {
+					try {
+						Object pv = pd.getReadMethod().invoke(obj);
+						if (pv != null) {
+							if (pv.getClass().isArray()) {
+								pv = Arrays.asList((Object[])pv);
+							}
+							if (pv instanceof List) {
+								if (!((List)pv).isEmpty()) {
+									level++;
+									indent(level);
+									out.println(pd.getName() + "= [");
+									for (Object e: (List)pv) {
+										level++;
+										print(e);
+										level--;
+									}
+									indent(level);
+									out.println( " ]");
+									level--;
+								}
+							}
+							else {
+								Class<?> pvc = pv.getClass();
+								if (pvc.isPrimitive() || pvc.getName().startsWith("java.") || pvc.getName().startsWith("javax.") || pvc.isEnum()) {
+									if (!pd.getName().equals("class")) {
+										if (!(Boolean.FALSE.equals(pv))) {
+											indent(level+1);
+											out.println(pd.getName() + "=" + pv.toString());
+										}
+									}
+								} else {
+									level++;
+									print(pv);
+									level--;
+								}
+							}
+						}
+					} catch (Exception e) {}
+				}
+				indent(level);
+				out.println("}");
+			} catch (IntrospectionException e) {
+				indent(level);
+				out.println(e);
+			}
+		}
+	}
+
+}

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/util/PrintUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/java/org/apache/tuscany/assembly/builder/util/PrintUtil.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/Calculator.composite?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/Calculator.composite (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/Calculator.composite Wed Mar 21 00:54:29 2007
@@ -0,0 +1,52 @@
+<?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:calc="http://sample.calculator"
+	name="calc:Calculator">
+
+    <service name="CalculatorService" promote="CalculatorServiceComponent">
+        <interface.java interface="calculator.CalculatorService"/>
+    </service>
+
+    <component name="CalculatorServiceComponent">
+		<implementation.java class="calculator.CalculatorServiceImpl"/>
+        <reference name="addService" target="AddServiceComponent"/>
+        <reference name="subtractService" target="SubtractServiceComponent"/>
+        <reference name="multiplyService" target="MultiplyServiceComponent"/>
+        <reference name="divideService" target="DivideServiceComponent"/>
+    </component>
+
+    <component name="AddServiceComponent">
+        <implementation.java class="calculator.AddServiceImpl"/>
+    </component>
+
+    <component name="SubtractServiceComponent">
+        <implementation.java class="calculator.SubtractServiceImpl"/>
+    </component>
+
+    <component name="MultiplyServiceComponent">
+        <implementation.java class="calculator.MultiplyServiceImpl"/>
+    </component>
+
+    <component name="DivideServiceComponent">
+        <implementation.java class="calculator.DivideServiceImpl"/>
+    </component>
+
+</composite>

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/Calculator.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/Calculator.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorComponent.constrainingType
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorComponent.constrainingType?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorComponent.constrainingType (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorComponent.constrainingType Wed Mar 21 00:54:29 2007
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<constrainingType xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	xmlns:calc="http://sample.calculator"
+	name="calc:CalculatorComponent">
+
+  <service name="CalculatorService">
+        <interface.java class="calculator.CalculatorService" />
+  </service>
+
+  <reference name="divideService">
+        <interface.java class="calculator.DivideService" />
+  </reference>  
+
+</constrainingType>              
+       
\ No newline at end of file

Added: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorImpl.componentType
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorImpl.componentType?view=auto&rev=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorImpl.componentType (added)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorImpl.componentType Wed Mar 21 00:54:29 2007
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0">
+
+  <service name="CalculatorService">
+        <interface.java class="calculator.CalculatorService" />
+  </service>
+
+  <reference name="divideService">
+        <interface.java class="calculator.DivideService" />
+  </reference>  
+
+</componentType>              
+       
\ No newline at end of file

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorImpl.componentType
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/sandbox/sebastien/java/sca/assembly-builder/src/test/resources/CalculatorImpl.componentType
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: incubator/tuscany/sandbox/sebastien/java/sca/assembly-scdl/pom.xml (from r520786, incubator/tuscany/sandbox/sebastien/java/sca/scdl/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/assembly-scdl/pom.xml?view=diff&rev=520787&p1=incubator/tuscany/sandbox/sebastien/java/sca/scdl/pom.xml&r1=520786&p2=incubator/tuscany/sandbox/sebastien/java/sca/assembly-scdl/pom.xml&r2=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/scdl/pom.xml (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/assembly-scdl/pom.xml Wed Mar 21 00:54:29 2007
@@ -24,7 +24,7 @@
         <version>0.1-sandbox-incubating-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>tuscany-scdl</artifactId>
+    <artifactId>tuscany-assembly-scdl</artifactId>
     <packaging>jar</packaging>
     <name>Apache Tuscany SCDL support</name>
     <description>Apache Tuscany SCDL support.</description>

Modified: incubator/tuscany/sandbox/sebastien/java/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca/pom.xml?view=diff&rev=520787&r1=520786&r2=520787
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca/pom.xml (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca/pom.xml Wed Mar 21 00:54:29 2007
@@ -308,7 +308,8 @@
             <modules>
                 <module>policy</module>
                 <module>assembly</module>
-                <module>scdl</module>
+                <module>assembly-builder</module>
+                <module>assembly-scdl</module>
                 <module>kernel</module>
                 <module>services</module>
                 <module>extensions</module>
@@ -320,7 +321,8 @@
             <modules>
                 <module>policy</module>
                 <module>assembly</module>
-                <module>scdl</module>
+                <module>assembly-builder</module>
+                <module>assembly-scdl</module>
                 <module>kernel</module>
                 <module>services</module>
                 <module>extensions</module>
@@ -332,7 +334,8 @@
             <modules>
                 <module>policy</module>
                 <module>assembly</module>
-                <module>scdl</module>
+                <module>assembly-builder</module>
+                <module>assembly-scdl</module>
                 <module>kernel</module>
                 <module>services</module>
                 <module>extensions</module>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org