tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r951651 [8/13] - in /tuscany/sca-java-2.x/trunk/modules: assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ assembly/src/main/java/org/apache/tuscany/sca/assembly/ assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ bi...
Date Sat, 05 Jun 2010 05:17:51 GMT
Propchange: tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java?rev=951651&r1=951650&r2=951651&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java Sat Jun  5 05:17:47 2010
@@ -1,105 +1,105 @@
-/*
- * 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.domain.node;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import itest.nodes.Helloworld;
-
-import java.net.URI;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.oasisopen.sca.NoSuchDomainException;
-import org.oasisopen.sca.NoSuchServiceException;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-@Ignore("TUSCANY-3391")
-public class OneNodeTestCase{
-
-    private static DomainNode domain;
-    private static String serviceContributionUri;
-    
-    @Before
-    public void setUpBeforeClass() throws Exception {
-        domain = new DomainNode();
-        serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar");
-        domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar");
-    }
-
-    @Test
-    public void testService() throws Exception {
-        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");
-        assertNotNull(service);
-        assertEquals("Hello Petra", service.sayHello("Petra"));
-    }
-
-    @Test
-    public void testClient() throws Exception {
-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-    }
-    
-    @Test
-    public void testRemovingServiceContribution() throws Exception {
-        domain.removeContribution(serviceContributionUri);
-        try {
-            SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");
-        // FIXME: should this be NoSuchServiceException or ServiceNotFoundException?
-        } catch (NoSuchServiceException e) {
-            // expected
-        }
-
-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        try {
-            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-            fail();
-        } catch (Exception e) {
-            // FIXME: this gives an NPE, would be better to be something like ServiceNotFoundException
-            // expected
-        }
-    }
-
-    @Test
-    public void testStoppingDomainNode() throws Exception {
-        domain.stop();
-        try {
-            SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
-            fail();
-        } catch (NoSuchDomainException e) {
-            // expected
-        }
-    }
-
-    @After
-    public void tearDownAfterClass() throws Exception {
-        if (domain != null) {
-            domain.stop();
-        }
-    }
-}
+/*
+ * 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.domain.node;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import itest.nodes.Helloworld;
+
+import java.net.URI;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.oasisopen.sca.NoSuchDomainException;
+import org.oasisopen.sca.NoSuchServiceException;
+import org.oasisopen.sca.client.SCAClientFactory;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+@Ignore("TUSCANY-3391")
+public class OneNodeTestCase{
+
+    private static DomainNode domain;
+    private static String serviceContributionUri;
+    
+    @Before
+    public void setUpBeforeClass() throws Exception {
+        domain = new DomainNode();
+        serviceContributionUri = domain.addContribution("target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar");
+        domain.addContribution("target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar");
+    }
+
+    @Test
+    public void testService() throws Exception {
+        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");
+        assertNotNull(service);
+        assertEquals("Hello Petra", service.sayHello("Petra"));
+    }
+
+    @Test
+    public void testClient() throws Exception {
+        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+    }
+    
+    @Test
+    public void testRemovingServiceContribution() throws Exception {
+        domain.removeContribution(serviceContributionUri);
+        try {
+            SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldService");
+        // FIXME: should this be NoSuchServiceException or ServiceNotFoundException?
+        } catch (NoSuchServiceException e) {
+            // expected
+        }
+
+        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+        try {
+            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+            fail();
+        } catch (Exception e) {
+            // FIXME: this gives an NPE, would be better to be something like ServiceNotFoundException
+            // expected
+        }
+    }
+
+    @Test
+    public void testStoppingDomainNode() throws Exception {
+        domain.stop();
+        try {
+            SCAClientFactory.newInstance(URI.create("vm://defaultDomain")).getService(Helloworld.class, "HelloworldClient");
+            fail();
+        } catch (NoSuchDomainException e) {
+            // expected
+        }
+    }
+
+    @After
+    public void tearDownAfterClass() throws Exception {
+        if (domain != null) {
+            domain.stop();
+        }
+    }
+}

Propchange: tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java?rev=951651&r1=951650&r2=951651&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java Sat Jun  5 05:17:47 2010
@@ -1,82 +1,82 @@
-/*
- * 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.domain.node;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import itest.nodes.Helloworld;
-
-import java.net.URI;
-
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-@Ignore("TUSCANY-3391")
-public class StopStartNodesTestCase{
-
-    private static DomainNode clientNode;
-    private static DomainNode serviceNode;
-    
-    @Test
-    public void testTwoNodesSameDomain() throws Exception {
-        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"});
-        clientNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"});
-
-        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService");
-        assertNotNull(service);
-        assertEquals("Hello Petra", service.sayHello("Petra"));
-
-        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-
-        serviceNode.stop();
-
-        client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        try {
-            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-            fail();
-        } catch (Exception e) {
-            // expected
-        }
-
-        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"});
-        client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
-        assertNotNull(client);
-        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-    }
-
-    @After
-    public void tearDownAfterClass() throws Exception {
-        if (clientNode != null) {
-            clientNode.stop();
-        }
-        if (serviceNode != null) {
-            serviceNode.stop();
-        }
-    }
-}
+/*
+ * 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.domain.node;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import itest.nodes.Helloworld;
+
+import java.net.URI;
+
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.oasisopen.sca.client.SCAClientFactory;
+
+/**
+ * This shows how to test the Calculator service component.
+ */
+@Ignore("TUSCANY-3391")
+public class StopStartNodesTestCase{
+
+    private static DomainNode clientNode;
+    private static DomainNode serviceNode;
+    
+    @Test
+    public void testTwoNodesSameDomain() throws Exception {
+        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"});
+        clientNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"});
+
+        Helloworld service = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldService");
+        assertNotNull(service);
+        assertEquals("Hello Petra", service.sayHello("Petra"));
+
+        Helloworld client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+
+        serviceNode.stop();
+
+        client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+        try {
+            assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+            fail();
+        } catch (Exception e) {
+            // expected
+        }
+
+        serviceNode = new DomainNode("vm://fooDomain", new String[]{"target/test-classes/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar"});
+        client = SCAClientFactory.newInstance(URI.create("vm://fooDomain")).getService(Helloworld.class, "HelloworldClient");
+        assertNotNull(client);
+        assertEquals("Hi Hello Petra", client.sayHello("Petra"));
+    }
+
+    @After
+    public void tearDownAfterClass() throws Exception {
+        if (clientNode != null) {
+            clientNode.stop();
+        }
+        if (serviceNode != null) {
+            serviceNode.stop();
+        }
+    }
+}

Propchange: tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sca-java-2.x/trunk/modules/domain/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java?rev=951651&r1=951650&r2=951651&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java Sat Jun  5 05:17:47 2010
@@ -1,235 +1,235 @@
-/*
- * 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.something;
-
-import java.io.Reader;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.deployment.Deployer;
-import org.apache.tuscany.sca.monitor.ValidationException;
-import org.apache.tuscany.sca.runtime.ActivationException;
-import org.oasisopen.sca.NoSuchServiceException;
-
-public interface Section10 {
-
-    /**
-     * 4577 10.5.1 install Contribution & update Contribution
-     * 4578 Creates or updates an installed contribution with a supplied root contribution, and installed at a supplied
-     * 4579 base URI. A supplied dependent contribution list (<export/> elements) specifies the contributions that are
-     * 4580 used to resolve the dependencies of the root contribution and other dependent contributions. These
-     * 4581 override any dependent contributions explicitly listed via the @location attribute in the import statements
-     * 4582 of the contribution.
-     * 4583 SCA follows the simplifying assumption that the use of a contribution for resolving anything also means
-     * 4584 that all other exported artifacts can be used from that contribution. Because of this, the dependent
-     * 4585 contribution list is just a list of installed contribution URIs. There is no need to specify what is being used
-     * 4586 from each one.
-     * 4587 Each dependent contribution is also an installed contribution, with its own dependent contributions. By
-     * 4588 default these dependent contributions of the dependent contributions (which we will call indirect
-     * 4589 dependent contributions) are included as dependent contributions of the installed contribution. However,
-     * 4590 if a contribution in the dependent contribution list exports any conflicting definitions with an indirect
-     * 4591 dependent contribution, then the indirect dependent contribution is not included (i.e. the explicit list
-     * 4592 overrides the default inclusion of indirect dependent contributions). Also, if there is ever a conflict
-     * 4593 between two indirect dependent contributions, then the conflict MUST be resolved by an explicit entry in
-     * 4594 the dependent contribution list.
-     * 4595 [ASM12009]
-     * 4596 Note that in many cases, the dependent contribution list can be generated. In particular, if the creator of
-     * 4597 a Domain is careful to avoid creating duplicate definitions for the same qualified name, then it is easy for
-     * 4598 this list to be generated by tooling.     * 
-     * @param uri
-     * @param contributionURL
-     * @throws ContributionReadException 
-     * @throws ActivationException 
-     * @throws ValidationException 
-     */
-    void installContribution(String uri, String contributionURL, String metaDataURL, List<String> dependentContributionURIs, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException;
-    void installContribution(Contribution contribution, List<String> dependentContributionURIs, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException;
-    
-    /* Useful short forms of that for when you don't care or have the others (but leave out for now to keep as simple as possible):
-    String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException;
-    void installContribution(String uri, String contributionURL) throws ContributionReadException, ActivationException, ValidationException;
-    String installContribution(String contributionURL, boolean autoDeploy) throws ContributionReadException, ActivationException, ValidationException;
-    */
-    
-    /**
-     * 4577 10.5.1 install Contribution & update Contribution
-     * 4578 Creates or updates an installed contribution with a supplied root contribution, and installed at a supplied
-     * 4579 base URI. A supplied dependent contribution list (<export/> elements) specifies the contributions that are
-     * 4580 used to resolve the dependencies of the root contribution and other dependent contributions. These
-     * 4581 override any dependent contributions explicitly listed via the @location attribute in the import statements
-     * 4582 of the contribution.
-     * 4583 SCA follows the simplifying assumption that the use of a contribution for resolving anything also means
-     * 4584 that all other exported artifacts can be used from that contribution. Because of this, the dependent
-     * 4585 contribution list is just a list of installed contribution URIs. There is no need to specify what is being used
-     * 4586 from each one.
-     * 4587 Each dependent contribution is also an installed contribution, with its own dependent contributions. By
-     * 4588 default these dependent contributions of the dependent contributions (which we will call indirect
-     * 4589 dependent contributions) are included as dependent contributions of the installed contribution. However,
-     * 4590 if a contribution in the dependent contribution list exports any conflicting definitions with an indirect
-     * 4591 dependent contribution, then the indirect dependent contribution is not included (i.e. the explicit list
-     * 4592 overrides the default inclusion of indirect dependent contributions). Also, if there is ever a conflict
-     * 4593 between two indirect dependent contributions, then the conflict MUST be resolved by an explicit entry in
-     * 4594 the dependent contribution list.
-     * 4595 [ASM12009]
-     * 4596 Note that in many cases, the dependent contribution list can be generated. In particular, if the creator of
-     * 4597 a Domain is careful to avoid creating duplicate definitions for the same qualified name, then it is easy for
-     * 4598 this list to be generated by tooling.
-     *  
-     * @param uri
-     * @param contributionURL
-     */
-    void updateContribution(String uri, String contributionURL);
-    void updateContribution(Contribution contribution);
-
-    /**
-     * 4599 10.5.2 add Deployment Composite & update Deployment Composite
-     * 4600 Adds or updates a deployment composite using a supplied composite ("composite by value" – a data
-     * 4601 structure, not an existing resource in the Domain) to the contribution identified by a supplied contribution
-     * 4602 URI. The added or updated deployment composite is given a relative URI that matches the @name
-     * 4603 attribute of the composite, with a “.composite” suffix. Since all composites run within the context of a
-     * 4604 installed contribution (any component implementations or other definitions are resolved within that
-     * 4605 contribution), this functionality makes it possible for the deployer to create a composite with final
-     * 4606 configuration and wiring decisions and add it to an installed contribution without having to modify the
-     * 4607 contents of the root contribution.
-     * 4608 Also, in some use cases, a contribution might include only implementation code (e.g. PHP scripts). It is
-     * 4609 then possible for those to be given component names by a (possibly generated) composite that is added
-     * 4610 into the installed contribution, without having to modify the packaging.     * 
-     * 
-     * @param uri
-     * @param compositeXML
-     * @return
-     * @throws XMLStreamException 
-     * @throws ContributionReadException 
-     * @throws ActivationException 
-     * @throws ValidationException 
-     */
-    String addDeploymentComposite(String contributionURI, Reader compositeXML) throws ContributionReadException, XMLStreamException, ActivationException, ValidationException;
-    String addDeploymentComposite(String contributionURI, Composite composite) throws ActivationException;
-
-    /**
-     * 4599 10.5.2 add Deployment Composite & update Deployment Composite
-     * 4600 Adds or updates a deployment composite using a supplied composite ("composite by value" – a data
-     * 4601 structure, not an existing resource in the Domain) to the contribution identified by a supplied contribution
-     * 4602 URI. The added or updated deployment composite is given a relative URI that matches the @name
-     * 4603 attribute of the composite, with a “.composite” suffix. Since all composites run within the context of a
-     * 4604 installed contribution (any component implementations or other definitions are resolved within that
-     * 4605 contribution), this functionality makes it possible for the deployer to create a composite with final
-     * 4606 configuration and wiring decisions and add it to an installed contribution without having to modify the
-     * 4607 contents of the root contribution.
-     * 4608 Also, in some use cases, a contribution might include only implementation code (e.g. PHP scripts). It is
-     * 4609 then possible for those to be given component names by a (possibly generated) composite that is added
-     * 4610 into the installed contribution, without having to modify the packaging.     * 
-     * 
-     * @param uri
-     * @param compositeXML
-     * @return
-     */
-    String updateDeploymentComposite(String uri, Reader compositeXML);
-    String updateDeploymentComposite(String uri, Composite composite);
-
-    /**
-     * 4611 11.4.310.5.3 remove Contribution
-     * 4612 Removes the deployed contribution identified by a supplied contribution URI.
-     * 
-     * @param contributionURI
-     * @return List of contribution URIs (includes dependent contributions) which were removed
-     * @throws ActivationException 
-     */
-    List<String> removeContribution(String contributionURI) throws ActivationException;
-
-    /**
-     * 4677 10.7.1 add To Domain-Level Composite
-     * 4678 This functionality adds the composite identified by a supplied URI to the Domain Level Composite. The
-     * 4679 supplied composite URI refers to a composite within an installed contribution. The composite's installed
-     * 4680 contribution determines how the composite’s artifacts are resolved (directly and indirectly). The supplied
-     * 4681 composite is added to the domain composite with semantics that correspond to the domain-level
-     * 4683 components become top-level components and the component services become externally visible
-     * 4684 services (eg. they would be present in a WSDL description of the Domain). The meaning of any promoted
-     * 4685 services and references in the supplied composite is not defined; since there is no composite scope
-     * 4686 outside the domain composite, the usual idea of promotion has no utility.
-     *  
-     * @param compositeURI
-     * @throws ActivationException 
-     */
-    void addToDomainLevelComposite(String compositeURI) throws ActivationException;
-    
-    /**
-     * 4687 10.7.2 remove From Domain-Level Composite
-     * 4688 Removes from the Domain Level composite the elements corresponding to the composite identified by a
-     * 4689 supplied composite URI. This means that the removal of the components, wires, services and references
-     * 4690 originally added to the domain level composite by the identified composite.     * 
-     * @param compositeURI
-     * @throws ActivationException 
-     */
-    void removeFromDomainLevelComposite(String compositeURI) throws ActivationException;
-
-    /**
-     * 10.7.3 get Domain-Level Composite
-     * Returns a <composite> definition that has an <include> line for each composite that had been added to
-     * the domain level composite. It is important to note that, in dereferencing the included composites, any
-     * referenced artifacts are resolved in terms of that installed composite.
-     * 
-     * @return
-     */
-    Composite getDomainLevelComposite();
-    
-    /* that previous one returns a Composte object but not sure what would be most appropriate, and having one return a string seems convenient: */
-    String getDomainLevelCompositeAsString();
-    
-    /**
-     * 4695 10.7.4 get QName Definition
-     * 4696 In order to make sense of the domain-level composite (as returned by get Domain-Level Composite), it
-     * 4697 needs to be possible to get the definitions for named artifacts in the included composites. This
-     * 4698 functionality takes the supplied URI of an installed contribution (which provides the context), a supplied
-     * 4699 qualified name of a definition to look up, and a supplied symbol space (as a QName, e.g.
-     * 4700 wsdl:PortTypeportType). The result is a single definition, in whatever form is appropriate for that
-     * 4701 definition type.
-     * 4702 Note that this, like all the other domain-level operations, is a conceptual operation. Its capabilities need to
-     * 4703 exist in some form, but not necessarily as a service operation with exactly this signature.     * 
-     * @param contributionURI
-     * @param definition
-     * @param symbolSpace
-     * @return
-     */
-    Object getQNameDefinition(String contributionURI, QName definition, QName symbolSpace);
-
-    /**
-     * Probably want to be able to stop it all at once so a method called stop or shutdown or destroy
-     * though i guess it could be argued that this method may be somewhere else
-     * @throws ActivationException 
-     */
-    void shutdown() throws ActivationException;
-
-    /**
-     * Would also be convenient to get service proxys as from SCAClientFactory
-     */
-    <T> T getService(Class<T> interfaze, String serviceURI) throws NoSuchServiceException;    
-
-    /* do we also need these following ones that are mentioned only indirectly in the spec? */
-    
-    List<String> getDeployedCompostes(String contributionURI);
-    List<String> getInstalledContributions();
-    Deployer getDeployer();
-}
+/*
+ * 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.something;
+
+import java.io.Reader;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.deployment.Deployer;
+import org.apache.tuscany.sca.monitor.ValidationException;
+import org.apache.tuscany.sca.runtime.ActivationException;
+import org.oasisopen.sca.NoSuchServiceException;
+
+public interface Section10 {
+
+    /**
+     * 4577 10.5.1 install Contribution & update Contribution
+     * 4578 Creates or updates an installed contribution with a supplied root contribution, and installed at a supplied
+     * 4579 base URI. A supplied dependent contribution list (<export/> elements) specifies the contributions that are
+     * 4580 used to resolve the dependencies of the root contribution and other dependent contributions. These
+     * 4581 override any dependent contributions explicitly listed via the @location attribute in the import statements
+     * 4582 of the contribution.
+     * 4583 SCA follows the simplifying assumption that the use of a contribution for resolving anything also means
+     * 4584 that all other exported artifacts can be used from that contribution. Because of this, the dependent
+     * 4585 contribution list is just a list of installed contribution URIs. There is no need to specify what is being used
+     * 4586 from each one.
+     * 4587 Each dependent contribution is also an installed contribution, with its own dependent contributions. By
+     * 4588 default these dependent contributions of the dependent contributions (which we will call indirect
+     * 4589 dependent contributions) are included as dependent contributions of the installed contribution. However,
+     * 4590 if a contribution in the dependent contribution list exports any conflicting definitions with an indirect
+     * 4591 dependent contribution, then the indirect dependent contribution is not included (i.e. the explicit list
+     * 4592 overrides the default inclusion of indirect dependent contributions). Also, if there is ever a conflict
+     * 4593 between two indirect dependent contributions, then the conflict MUST be resolved by an explicit entry in
+     * 4594 the dependent contribution list.
+     * 4595 [ASM12009]
+     * 4596 Note that in many cases, the dependent contribution list can be generated. In particular, if the creator of
+     * 4597 a Domain is careful to avoid creating duplicate definitions for the same qualified name, then it is easy for
+     * 4598 this list to be generated by tooling.     * 
+     * @param uri
+     * @param contributionURL
+     * @throws ContributionReadException 
+     * @throws ActivationException 
+     * @throws ValidationException 
+     */
+    void installContribution(String uri, String contributionURL, String metaDataURL, List<String> dependentContributionURIs, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException;
+    void installContribution(Contribution contribution, List<String> dependentContributionURIs, boolean deployDeployables) throws ContributionReadException, ActivationException, ValidationException;
+    
+    /* Useful short forms of that for when you don't care or have the others (but leave out for now to keep as simple as possible):
+    String installContribution(String contributionURL) throws ContributionReadException, ActivationException, ValidationException;
+    void installContribution(String uri, String contributionURL) throws ContributionReadException, ActivationException, ValidationException;
+    String installContribution(String contributionURL, boolean autoDeploy) throws ContributionReadException, ActivationException, ValidationException;
+    */
+    
+    /**
+     * 4577 10.5.1 install Contribution & update Contribution
+     * 4578 Creates or updates an installed contribution with a supplied root contribution, and installed at a supplied
+     * 4579 base URI. A supplied dependent contribution list (<export/> elements) specifies the contributions that are
+     * 4580 used to resolve the dependencies of the root contribution and other dependent contributions. These
+     * 4581 override any dependent contributions explicitly listed via the @location attribute in the import statements
+     * 4582 of the contribution.
+     * 4583 SCA follows the simplifying assumption that the use of a contribution for resolving anything also means
+     * 4584 that all other exported artifacts can be used from that contribution. Because of this, the dependent
+     * 4585 contribution list is just a list of installed contribution URIs. There is no need to specify what is being used
+     * 4586 from each one.
+     * 4587 Each dependent contribution is also an installed contribution, with its own dependent contributions. By
+     * 4588 default these dependent contributions of the dependent contributions (which we will call indirect
+     * 4589 dependent contributions) are included as dependent contributions of the installed contribution. However,
+     * 4590 if a contribution in the dependent contribution list exports any conflicting definitions with an indirect
+     * 4591 dependent contribution, then the indirect dependent contribution is not included (i.e. the explicit list
+     * 4592 overrides the default inclusion of indirect dependent contributions). Also, if there is ever a conflict
+     * 4593 between two indirect dependent contributions, then the conflict MUST be resolved by an explicit entry in
+     * 4594 the dependent contribution list.
+     * 4595 [ASM12009]
+     * 4596 Note that in many cases, the dependent contribution list can be generated. In particular, if the creator of
+     * 4597 a Domain is careful to avoid creating duplicate definitions for the same qualified name, then it is easy for
+     * 4598 this list to be generated by tooling.
+     *  
+     * @param uri
+     * @param contributionURL
+     */
+    void updateContribution(String uri, String contributionURL);
+    void updateContribution(Contribution contribution);
+
+    /**
+     * 4599 10.5.2 add Deployment Composite & update Deployment Composite
+     * 4600 Adds or updates a deployment composite using a supplied composite ("composite by value" – a data
+     * 4601 structure, not an existing resource in the Domain) to the contribution identified by a supplied contribution
+     * 4602 URI. The added or updated deployment composite is given a relative URI that matches the @name
+     * 4603 attribute of the composite, with a “.composite” suffix. Since all composites run within the context of a
+     * 4604 installed contribution (any component implementations or other definitions are resolved within that
+     * 4605 contribution), this functionality makes it possible for the deployer to create a composite with final
+     * 4606 configuration and wiring decisions and add it to an installed contribution without having to modify the
+     * 4607 contents of the root contribution.
+     * 4608 Also, in some use cases, a contribution might include only implementation code (e.g. PHP scripts). It is
+     * 4609 then possible for those to be given component names by a (possibly generated) composite that is added
+     * 4610 into the installed contribution, without having to modify the packaging.     * 
+     * 
+     * @param uri
+     * @param compositeXML
+     * @return
+     * @throws XMLStreamException 
+     * @throws ContributionReadException 
+     * @throws ActivationException 
+     * @throws ValidationException 
+     */
+    String addDeploymentComposite(String contributionURI, Reader compositeXML) throws ContributionReadException, XMLStreamException, ActivationException, ValidationException;
+    String addDeploymentComposite(String contributionURI, Composite composite) throws ActivationException;
+
+    /**
+     * 4599 10.5.2 add Deployment Composite & update Deployment Composite
+     * 4600 Adds or updates a deployment composite using a supplied composite ("composite by value" – a data
+     * 4601 structure, not an existing resource in the Domain) to the contribution identified by a supplied contribution
+     * 4602 URI. The added or updated deployment composite is given a relative URI that matches the @name
+     * 4603 attribute of the composite, with a “.composite” suffix. Since all composites run within the context of a
+     * 4604 installed contribution (any component implementations or other definitions are resolved within that
+     * 4605 contribution), this functionality makes it possible for the deployer to create a composite with final
+     * 4606 configuration and wiring decisions and add it to an installed contribution without having to modify the
+     * 4607 contents of the root contribution.
+     * 4608 Also, in some use cases, a contribution might include only implementation code (e.g. PHP scripts). It is
+     * 4609 then possible for those to be given component names by a (possibly generated) composite that is added
+     * 4610 into the installed contribution, without having to modify the packaging.     * 
+     * 
+     * @param uri
+     * @param compositeXML
+     * @return
+     */
+    String updateDeploymentComposite(String uri, Reader compositeXML);
+    String updateDeploymentComposite(String uri, Composite composite);
+
+    /**
+     * 4611 11.4.310.5.3 remove Contribution
+     * 4612 Removes the deployed contribution identified by a supplied contribution URI.
+     * 
+     * @param contributionURI
+     * @return List of contribution URIs (includes dependent contributions) which were removed
+     * @throws ActivationException 
+     */
+    List<String> removeContribution(String contributionURI) throws ActivationException;
+
+    /**
+     * 4677 10.7.1 add To Domain-Level Composite
+     * 4678 This functionality adds the composite identified by a supplied URI to the Domain Level Composite. The
+     * 4679 supplied composite URI refers to a composite within an installed contribution. The composite's installed
+     * 4680 contribution determines how the composite’s artifacts are resolved (directly and indirectly). The supplied
+     * 4681 composite is added to the domain composite with semantics that correspond to the domain-level
+     * 4683 components become top-level components and the component services become externally visible
+     * 4684 services (eg. they would be present in a WSDL description of the Domain). The meaning of any promoted
+     * 4685 services and references in the supplied composite is not defined; since there is no composite scope
+     * 4686 outside the domain composite, the usual idea of promotion has no utility.
+     *  
+     * @param compositeURI
+     * @throws ActivationException 
+     */
+    void addToDomainLevelComposite(String compositeURI) throws ActivationException;
+    
+    /**
+     * 4687 10.7.2 remove From Domain-Level Composite
+     * 4688 Removes from the Domain Level composite the elements corresponding to the composite identified by a
+     * 4689 supplied composite URI. This means that the removal of the components, wires, services and references
+     * 4690 originally added to the domain level composite by the identified composite.     * 
+     * @param compositeURI
+     * @throws ActivationException 
+     */
+    void removeFromDomainLevelComposite(String compositeURI) throws ActivationException;
+
+    /**
+     * 10.7.3 get Domain-Level Composite
+     * Returns a <composite> definition that has an <include> line for each composite that had been added to
+     * the domain level composite. It is important to note that, in dereferencing the included composites, any
+     * referenced artifacts are resolved in terms of that installed composite.
+     * 
+     * @return
+     */
+    Composite getDomainLevelComposite();
+    
+    /* that previous one returns a Composte object but not sure what would be most appropriate, and having one return a string seems convenient: */
+    String getDomainLevelCompositeAsString();
+    
+    /**
+     * 4695 10.7.4 get QName Definition
+     * 4696 In order to make sense of the domain-level composite (as returned by get Domain-Level Composite), it
+     * 4697 needs to be possible to get the definitions for named artifacts in the included composites. This
+     * 4698 functionality takes the supplied URI of an installed contribution (which provides the context), a supplied
+     * 4699 qualified name of a definition to look up, and a supplied symbol space (as a QName, e.g.
+     * 4700 wsdl:PortTypeportType). The result is a single definition, in whatever form is appropriate for that
+     * 4701 definition type.
+     * 4702 Note that this, like all the other domain-level operations, is a conceptual operation. Its capabilities need to
+     * 4703 exist in some form, but not necessarily as a service operation with exactly this signature.     * 
+     * @param contributionURI
+     * @param definition
+     * @param symbolSpace
+     * @return
+     */
+    Object getQNameDefinition(String contributionURI, QName definition, QName symbolSpace);
+
+    /**
+     * Probably want to be able to stop it all at once so a method called stop or shutdown or destroy
+     * though i guess it could be argued that this method may be somewhere else
+     * @throws ActivationException 
+     */
+    void shutdown() throws ActivationException;
+
+    /**
+     * Would also be convenient to get service proxys as from SCAClientFactory
+     */
+    <T> T getService(Class<T> interfaze, String serviceURI) throws NoSuchServiceException;    
+
+    /* do we also need these following ones that are mentioned only indirectly in the spec? */
+    
+    List<String> getDeployedCompostes(String contributionURI);
+    List<String> getInstalledContributions();
+    Deployer getDeployer();
+}

Propchange: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10Factory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10Factory.java?rev=951651&r1=951650&r2=951651&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10Factory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10Factory.java Sat Jun  5 05:17:47 2010
@@ -1,97 +1,97 @@
-/*
- * 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.something;
-
-import java.util.Properties;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
-import org.apache.tuscany.sca.deployment.Deployer;
-import org.apache.tuscany.sca.runtime.CompositeActivator;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
-import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory;
-import org.apache.tuscany.sca.runtime.RuntimeProperties;
-import org.apache.tuscany.sca.something.impl.Section10Impl;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-public class Section10Factory {
-
-    private Deployer deployer;
-    private ExtensionPointRegistry extensionPointRegistry;
-    private CompositeActivator compositeActivator;
-    private ExtensibleDomainRegistryFactory domainRegistryFactory;
-
-    // TODO: keep this method?
-    public static Section10 createSection10() {
-        return new Section10Factory().createSection10("default");
-    }
-
-    public Section10Factory() {
-        init(null);
-    }
-
-    public Section10Factory(Properties config) {
-        init(config);
-    }
-
-    public Section10 createSection10(String domainName) {
-        EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry("default", domainName);
-        return new Section10Impl(domainName, deployer, compositeActivator, endpointRegistry, extensionPointRegistry);
-    }
-
-    public void shutdown() {
-        deployer.stop();
-        extensionPointRegistry.stop();
-    }
-
-    protected void init(Properties config) {
-        if (config == null) {
-            config = new Properties();
-            config.setProperty("defaultScheme", "vm");
-            config.setProperty("defaultDomainName", "default");
-        }
-        this.extensionPointRegistry = new DefaultExtensionPointRegistry();
-        extensionPointRegistry.start();
-
-        FactoryExtensionPoint modelFactories = extensionPointRegistry.getExtensionPoint(FactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = new RuntimeAssemblyFactory(extensionPointRegistry);
-        modelFactories.addFactory(assemblyFactory);
-
-        UtilityExtensionPoint utilities = extensionPointRegistry.getExtensionPoint(UtilityExtensionPoint.class);
-        this.compositeActivator = utilities.getUtility(CompositeActivator.class);
-        this.deployer = utilities.getUtility(Deployer.class);
-        utilities.getUtility(RuntimeProperties.class).setProperties(config);
-        utilities.getUtility(WorkScheduler.class);
-
-        // Initialize the Tuscany module activators
-        // The module activators will be started
-        extensionPointRegistry.getExtensionPoint(ModuleActivatorExtensionPoint.class);
-
-        this.domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPointRegistry);
-//        DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPointRegistry);
-//        domainRegistryFactory.getEndpointRegistry(config.getProperty("reguri"), config.getProperty("defaultDomainName"));
-
-    }
-}
+/*
+ * 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.something;
+
+import java.util.Properties;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
+import org.apache.tuscany.sca.deployment.Deployer;
+import org.apache.tuscany.sca.runtime.CompositeActivator;
+import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory;
+import org.apache.tuscany.sca.runtime.RuntimeProperties;
+import org.apache.tuscany.sca.something.impl.Section10Impl;
+import org.apache.tuscany.sca.work.WorkScheduler;
+
+public class Section10Factory {
+
+    private Deployer deployer;
+    private ExtensionPointRegistry extensionPointRegistry;
+    private CompositeActivator compositeActivator;
+    private ExtensibleDomainRegistryFactory domainRegistryFactory;
+
+    // TODO: keep this method?
+    public static Section10 createSection10() {
+        return new Section10Factory().createSection10("default");
+    }
+
+    public Section10Factory() {
+        init(null);
+    }
+
+    public Section10Factory(Properties config) {
+        init(config);
+    }
+
+    public Section10 createSection10(String domainName) {
+        EndpointRegistry endpointRegistry = domainRegistryFactory.getEndpointRegistry("default", domainName);
+        return new Section10Impl(domainName, deployer, compositeActivator, endpointRegistry, extensionPointRegistry);
+    }
+
+    public void shutdown() {
+        deployer.stop();
+        extensionPointRegistry.stop();
+    }
+
+    protected void init(Properties config) {
+        if (config == null) {
+            config = new Properties();
+            config.setProperty("defaultScheme", "vm");
+            config.setProperty("defaultDomainName", "default");
+        }
+        this.extensionPointRegistry = new DefaultExtensionPointRegistry();
+        extensionPointRegistry.start();
+
+        FactoryExtensionPoint modelFactories = extensionPointRegistry.getExtensionPoint(FactoryExtensionPoint.class);
+        AssemblyFactory assemblyFactory = new RuntimeAssemblyFactory(extensionPointRegistry);
+        modelFactories.addFactory(assemblyFactory);
+
+        UtilityExtensionPoint utilities = extensionPointRegistry.getExtensionPoint(UtilityExtensionPoint.class);
+        this.compositeActivator = utilities.getUtility(CompositeActivator.class);
+        this.deployer = utilities.getUtility(Deployer.class);
+        utilities.getUtility(RuntimeProperties.class).setProperties(config);
+        utilities.getUtility(WorkScheduler.class);
+
+        // Initialize the Tuscany module activators
+        // The module activators will be started
+        extensionPointRegistry.getExtensionPoint(ModuleActivatorExtensionPoint.class);
+
+        this.domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPointRegistry);
+//        DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionPointRegistry);
+//        domainRegistryFactory.getEndpointRegistry(config.getProperty("reguri"), config.getProperty("defaultDomainName"));
+
+    }
+}

Propchange: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10Factory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/Section10Factory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/DeployedComposite.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/DeployedComposite.java?rev=951651&r1=951650&r2=951651&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/DeployedComposite.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/DeployedComposite.java Sat Jun  5 05:17:47 2010
@@ -1,138 +1,138 @@
-/*
- * 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.something.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
-import org.apache.tuscany.sca.context.CompositeContext;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.deployment.Deployer;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.ValidationException;
-import org.apache.tuscany.sca.runtime.ActivationException;
-import org.apache.tuscany.sca.runtime.CompositeActivator;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
-
-public class DeployedComposite {
-    
-    private String uri;
-    private Composite composite; 
-    private InstalledContribution installedContribution; 
-    private List<Contribution> dependedOnContributions;
-    private Composite domainComposite; // TODO: this is misleadingly named
-    
-    private CompositeActivator compositeActivator;
-    private CompositeContext compositeContext;
-    private Deployer deployer;
-    private EndpointRegistry endpointRegistry;
-    private ExtensionPointRegistry extensionPointRegistry;
-
-    public DeployedComposite(Composite composite,
-                             InstalledContribution ic,
-                             List<Contribution> dependedOnContributions,
-                             Deployer deployer,
-                             CompositeActivator compositeActivator,
-                             EndpointRegistry endpointRegistry,
-                             ExtensionPointRegistry extensionPointRegistry) throws ActivationException {
-        this.composite = composite;
-        this.installedContribution = ic;
-        this.dependedOnContributions = dependedOnContributions;
-        this.deployer = deployer;
-        this.compositeActivator = compositeActivator;
-        this.endpointRegistry = endpointRegistry;
-        this.extensionPointRegistry = extensionPointRegistry;
-        try {
-            init();
-        } catch (Exception e) {
-            throw new ActivationException(e);
-        }
-    }
-
-    protected void init() throws ValidationException, ContributionResolveException, CompositeBuilderException, ActivationException {
-        
-        List<Contribution> contribution = new ArrayList<Contribution>();
-        contribution.add(installedContribution.getContribution());
-        contribution.get(0).getDeployables().clear();
-        contribution.get(0).getDeployables().add(composite);
-        
-        Monitor monitor = deployer.createMonitor();
-// TODO: is the ContextMonitor neccessary here?         
-//        Monitor tcm = monitorFactory.setContextMonitor(monitor);
-//        try {
-            
-            domainComposite = deployer.build(contribution, dependedOnContributions, new HashMap<QName, List<String>>(), monitor);
-            monitor.analyzeProblems();
-
-//        } finally {
-//            monitorFactory.setContextMonitor(tcm);
-//        }
-        
-        compositeContext = new CompositeContext(extensionPointRegistry, 
-                                                endpointRegistry, 
-                                                domainComposite, 
-                                                null, // nothing appears to use the domain name in CompositeContext 
-                                                null, // don't need node uri
-                                                deployer.getSystemDefinitions());
-                       
-        CompositeContext.setThreadCompositeContext(compositeContext); // TODO: what is this doing?
-
-        compositeActivator.activate(compositeContext, domainComposite);
-        compositeActivator.start(compositeContext, domainComposite);
-
-        this.uri = getCompositeURI(composite, installedContribution);
-    }
-
-    public void unDeploy() throws ActivationException {
-        compositeActivator.stop(compositeContext, domainComposite);
-        compositeActivator.deactivate(domainComposite);
-    }
-    
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * Deployable composites don't have the uri set so get it from the artifact in the contribution
-     * // TODO: fix the Tuscany code so this uri is correctly set and this method isn't needed
-     */
-    protected String getCompositeURI(Composite c, InstalledContribution ic) {
-        for (Artifact a : ic.getContribution().getArtifacts()) {
-            if (a.getModel() != null) {
-                if (a.getModel() instanceof Composite) {
-                    Composite cm = a.getModel();
-                    if (c.getName().equals(cm.getName())) {
-                        return cm.getURI();
-                    }
-                }
-            }
-        }
-        // shouldn't ever happen
-        throw new IllegalStateException("can't determine composte uri");
-    }
-}
+/*
+ * 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.something.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
+import org.apache.tuscany.sca.context.CompositeContext;
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.deployment.Deployer;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.ValidationException;
+import org.apache.tuscany.sca.runtime.ActivationException;
+import org.apache.tuscany.sca.runtime.CompositeActivator;
+import org.apache.tuscany.sca.runtime.EndpointRegistry;
+
+public class DeployedComposite {
+    
+    private String uri;
+    private Composite composite; 
+    private InstalledContribution installedContribution; 
+    private List<Contribution> dependedOnContributions;
+    private Composite domainComposite; // TODO: this is misleadingly named
+    
+    private CompositeActivator compositeActivator;
+    private CompositeContext compositeContext;
+    private Deployer deployer;
+    private EndpointRegistry endpointRegistry;
+    private ExtensionPointRegistry extensionPointRegistry;
+
+    public DeployedComposite(Composite composite,
+                             InstalledContribution ic,
+                             List<Contribution> dependedOnContributions,
+                             Deployer deployer,
+                             CompositeActivator compositeActivator,
+                             EndpointRegistry endpointRegistry,
+                             ExtensionPointRegistry extensionPointRegistry) throws ActivationException {
+        this.composite = composite;
+        this.installedContribution = ic;
+        this.dependedOnContributions = dependedOnContributions;
+        this.deployer = deployer;
+        this.compositeActivator = compositeActivator;
+        this.endpointRegistry = endpointRegistry;
+        this.extensionPointRegistry = extensionPointRegistry;
+        try {
+            init();
+        } catch (Exception e) {
+            throw new ActivationException(e);
+        }
+    }
+
+    protected void init() throws ValidationException, ContributionResolveException, CompositeBuilderException, ActivationException {
+        
+        List<Contribution> contribution = new ArrayList<Contribution>();
+        contribution.add(installedContribution.getContribution());
+        contribution.get(0).getDeployables().clear();
+        contribution.get(0).getDeployables().add(composite);
+        
+        Monitor monitor = deployer.createMonitor();
+// TODO: is the ContextMonitor neccessary here?         
+//        Monitor tcm = monitorFactory.setContextMonitor(monitor);
+//        try {
+            
+            domainComposite = deployer.build(contribution, dependedOnContributions, new HashMap<QName, List<String>>(), monitor);
+            monitor.analyzeProblems();
+
+//        } finally {
+//            monitorFactory.setContextMonitor(tcm);
+//        }
+        
+        compositeContext = new CompositeContext(extensionPointRegistry, 
+                                                endpointRegistry, 
+                                                domainComposite, 
+                                                null, // nothing appears to use the domain name in CompositeContext 
+                                                null, // don't need node uri
+                                                deployer.getSystemDefinitions());
+                       
+        CompositeContext.setThreadCompositeContext(compositeContext); // TODO: what is this doing?
+
+        compositeActivator.activate(compositeContext, domainComposite);
+        compositeActivator.start(compositeContext, domainComposite);
+
+        this.uri = getCompositeURI(composite, installedContribution);
+    }
+
+    public void unDeploy() throws ActivationException {
+        compositeActivator.stop(compositeContext, domainComposite);
+        compositeActivator.deactivate(domainComposite);
+    }
+    
+    public String getURI() {
+        return uri;
+    }
+
+    /**
+     * Deployable composites don't have the uri set so get it from the artifact in the contribution
+     * // TODO: fix the Tuscany code so this uri is correctly set and this method isn't needed
+     */
+    protected String getCompositeURI(Composite c, InstalledContribution ic) {
+        for (Artifact a : ic.getContribution().getArtifacts()) {
+            if (a.getModel() != null) {
+                if (a.getModel() instanceof Composite) {
+                    Composite cm = a.getModel();
+                    if (c.getName().equals(cm.getName())) {
+                        return cm.getURI();
+                    }
+                }
+            }
+        }
+        // shouldn't ever happen
+        throw new IllegalStateException("can't determine composte uri");
+    }
+}

Propchange: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/DeployedComposite.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/DeployedComposite.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/InstalledContribution.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/InstalledContribution.java?rev=951651&r1=951650&r2=951651&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/InstalledContribution.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/InstalledContribution.java Sat Jun  5 05:17:47 2010
@@ -1,60 +1,60 @@
-/*
- * 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.something.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-
-public class InstalledContribution {
-
-    private String uri;
-    private String url;
-    private Contribution contribution;
-    private List<Composite> defaultDeployables = new ArrayList<Composite>();
-    private List<DeployedComposite> deployedComposites = new ArrayList<DeployedComposite>();
-    
-    public InstalledContribution(String uri, String url, Contribution contribution) {
-        this.uri = uri;
-        this.url = url;
-        this.contribution = contribution;
-        this.defaultDeployables = contribution.getDeployables();
-    }
-    public Contribution getContribution() {
-        return contribution;
-    }
-    public void setContribution(Contribution contribution) {
-        this.contribution = contribution;
-    }
-    public String getURI() {
-        return uri;
-    }
-    public String getURL() {
-        return url;
-    }
-    public List<Composite> getDefaultDeployables() {
-        return defaultDeployables;
-    }
-    public List<DeployedComposite> getDeployedComposites() {
-        return deployedComposites;
-    }
-}
+/*
+ * 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.something.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.contribution.Contribution;
+
+public class InstalledContribution {
+
+    private String uri;
+    private String url;
+    private Contribution contribution;
+    private List<Composite> defaultDeployables = new ArrayList<Composite>();
+    private List<DeployedComposite> deployedComposites = new ArrayList<DeployedComposite>();
+    
+    public InstalledContribution(String uri, String url, Contribution contribution) {
+        this.uri = uri;
+        this.url = url;
+        this.contribution = contribution;
+        this.defaultDeployables = contribution.getDeployables();
+    }
+    public Contribution getContribution() {
+        return contribution;
+    }
+    public void setContribution(Contribution contribution) {
+        this.contribution = contribution;
+    }
+    public String getURI() {
+        return uri;
+    }
+    public String getURL() {
+        return url;
+    }
+    public List<Composite> getDefaultDeployables() {
+        return defaultDeployables;
+    }
+    public List<DeployedComposite> getDeployedComposites() {
+        return deployedComposites;
+    }
+}

Propchange: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/InstalledContribution.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sca-java-2.x/trunk/modules/domain/src/main/java/org/apache/tuscany/sca/something/impl/InstalledContribution.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message