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/04/14 19:45:03 UTC
svn commit: r528844 - in /incubator/tuscany/java/sca/modules: ./
assembly-java-dsl/
assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/
assembly-java-dsl/src/main/resources/
assembly-java-dsl/src/test/java/org/apache/tuscany/assem...
Author: jsdelfino
Date: Sat Apr 14 10:45:02 2007
New Revision: 528844
URL: http://svn.apache.org/viewvc?view=rev&rev=528844
Log:
Copied assembly DSL builder module from the scdl4j work in sandbox.
Added:
incubator/tuscany/java/sca/modules/assembly-java-dsl/
- copied from r525724, incubator/tuscany/sandbox/sebastien/java/sca/modules/builder/
Removed:
incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/resources/
incubator/tuscany/java/sca/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/assembly/builder/util/
incubator/tuscany/java/sca/modules/assembly-java-dsl/src/test/resources/
Modified:
incubator/tuscany/java/sca/modules/assembly-java-dsl/pom.xml
incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java
incubator/tuscany/java/sca/modules/pom.xml
Modified: incubator/tuscany/java/sca/modules/assembly-java-dsl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-java-dsl/pom.xml?view=diff&rev=528844&r1=525724&r2=528844
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-java-dsl/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/assembly-java-dsl/pom.xml Sat Apr 14 10:45:02 2007
@@ -18,32 +18,21 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.sca.modules</groupId>
- <artifactId>parent</artifactId>
- <version>0.1-sandbox-incubating-SNAPSHOT</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-assembly-builder</artifactId>
- <packaging>jar</packaging>
- <name>Apache Tuscany SCA Assembly Model Builder</name>
- <description>Apache Tuscany SCA Assembly Model Builder</description>
+ <artifactId>tuscany-assembly-java-dsl</artifactId>
+ <name>Apache Tuscany SCA Assembly Java DSL</name>
<dependencies>
-
<dependency>
- <groupId>org.apache.tuscany.sca.modules</groupId>
+ <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>
+ <version>1.0-incubating-SNAPSHOT</version>
</dependency>
-
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java?view=diff&rev=528844&r1=525724&r2=528844
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/AssemblyBuilderImpl.java Sat Apr 14 10:45:02 2007
@@ -26,7 +26,7 @@
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.DefaultAssemblyFactory;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
public class AssemblyBuilderImpl extends DefaultAssemblyFactory implements AssemblyBuilder {
Modified: incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java?view=diff&rev=528844&r1=525724&r2=528844
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentBuilderImpl.java Sat Apr 14 10:45:02 2007
@@ -21,16 +21,16 @@
import java.util.List;
+import org.apache.tuscany.assembly.ComponentProperty;
+import org.apache.tuscany.assembly.ComponentReference;
+import org.apache.tuscany.assembly.ComponentService;
+import org.apache.tuscany.assembly.Composite;
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;
+import org.apache.tuscany.assembly.impl.ComponentImpl;
public class ComponentBuilderImpl extends ComponentImpl implements ComponentBuilder {
Modified: incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java?view=diff&rev=528844&r1=525724&r2=528844
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentPropertyBuilderImpl.java Sat Apr 14 10:45:02 2007
@@ -22,7 +22,7 @@
import javax.xml.namespace.QName;
import org.apache.tuscany.assembly.builder.ComponentPropertyBuilder;
-import org.apache.tuscany.assembly.model.impl.ComponentPropertyImpl;
+import org.apache.tuscany.assembly.impl.ComponentPropertyImpl;
public class ComponentPropertyBuilderImpl extends ComponentPropertyImpl implements ComponentPropertyBuilder {
@@ -33,8 +33,7 @@
}
public ComponentPropertyBuilderImpl configuredTo(Object value) {
- //TODO set the value instead
- this.setDefaultValue(value);
+ this.setValue(value);
return this;
}
Modified: incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java?view=diff&rev=528844&r1=525724&r2=528844
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentReferenceBuilderImpl.java Sat Apr 14 10:45:02 2007
@@ -19,13 +19,13 @@
package org.apache.tuscany.assembly.builder.impl;
+import org.apache.tuscany.assembly.ComponentService;
+import org.apache.tuscany.assembly.CompositeReference;
import org.apache.tuscany.assembly.builder.ComponentReferenceBuilder;
import org.apache.tuscany.assembly.builder.ComponentServiceBuilder;
-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;
+import org.apache.tuscany.assembly.impl.ComponentReferenceImpl;
+import org.apache.tuscany.assembly.impl.ComponentServiceImpl;
+import org.apache.tuscany.assembly.impl.CompositeReferenceImpl;
public class ComponentReferenceBuilderImpl extends ComponentReferenceImpl implements ComponentReferenceBuilder {
Modified: incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java?view=diff&rev=528844&r1=525724&r2=528844
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/ComponentServiceBuilderImpl.java Sat Apr 14 10:45:02 2007
@@ -19,10 +19,10 @@
package org.apache.tuscany.assembly.builder.impl;
+import org.apache.tuscany.assembly.CompositeService;
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;
+import org.apache.tuscany.assembly.impl.ComponentServiceImpl;
+import org.apache.tuscany.assembly.impl.CompositeServiceImpl;
public class ComponentServiceBuilderImpl extends ComponentServiceImpl implements ComponentServiceBuilder {
Modified: incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java?view=diff&rev=528844&r1=525724&r2=528844
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/assembly/builder/impl/CompositeBuilderImpl.java Sat Apr 14 10:45:02 2007
@@ -21,13 +21,13 @@
import java.util.List;
+import org.apache.tuscany.assembly.Component;
+import org.apache.tuscany.assembly.ComponentReference;
+import org.apache.tuscany.assembly.ComponentService;
+import org.apache.tuscany.assembly.Composite;
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;
+import org.apache.tuscany.assembly.impl.CompositeImpl;
public class CompositeBuilderImpl extends CompositeImpl implements CompositeBuilder {
Modified: incubator/tuscany/java/sca/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java?view=diff&rev=528844&r1=525724&r2=528844
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/assembly/builder/BigBankBuilderTestCase.java Sat Apr 14 10:45:02 2007
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.assembly.builder.util.PrintUtil;
+import org.apache.tuscany.assembly.util.PrintUtil;
public class BigBankBuilderTestCase extends TestCase {
@@ -30,9 +30,9 @@
BigBankBuilder builder = new BigBankBuilder();
CompositeBuilder domain = builder.build();
- System.out.println();
- new PrintUtil(System.out).print(domain);
- System.out.println();
+ //System.out.println();
+ //new PrintUtil(System.out).print(domain);
+ //System.out.println();
}
Modified: incubator/tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?view=diff&rev=528844&r1=528843&r2=528844
==============================================================================
--- incubator/tuscany/java/sca/modules/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/pom.xml Sat Apr 14 10:45:02 2007
@@ -37,6 +37,7 @@
</activation>
<modules>
<module>assembly</module>
+ <module>assembly-java-dsl</module>
<module>assembly-xml</module>
<!--
<module>binding-jms</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org