Moving 2.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835134 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 0 insertions, 942 deletions

diff --git a/branches/sca-java-2.0-M2/modules/definitions/LICENSE b/branches/sca-java-2.0-M2/modules/definitions/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-

diff --git a/branches/sca-java-2.0-M2/modules/definitions/META-INF/MANIFEST.MF b/branches/sca-java-2.0-M2/modules/definitions/META-INF/MANIFEST.MF
deleted file mode 100644
index a18128b83b..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.definitions.util;uses:="org.apa

- che.tuscany.sca.definitions";version="2.0.0",org.apache.tuscany.sca.def

- initions;uses:="org.apache.tuscany.sca.policy,javax.xml.namespace";ve

- rsion="2.0.0"

-Private-Package: org.apache.tuscany.sca.definitions.impl;version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Definitions

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397089625

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Definitions

-Import-Package: javax.xml.namespace,org.apache.tuscany.sca.definitions

- ;version="2.0.0",org.apache.tuscany.sca.definitions.util;version="2.0.0",

- org.apache.tuscany.sca.policy;version="2.0.0"

-Bundle-SymbolicName: org.apache.tuscany.sca.definitions

-Bundle-DocURL: http://www.apache.org/

-

diff --git a/branches/sca-java-2.0-M2/modules/definitions/NOTICE b/branches/sca-java-2.0-M2/modules/definitions/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/branches/sca-java-2.0-M2/modules/definitions/pom.xml b/branches/sca-java-2.0-M2/modules/definitions/pom.xml
deleted file mode 100644
index 677cf9d2e5..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>tuscany-modules</artifactId>

-        <version>2.0-M2-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <artifactId>tuscany-definitions</artifactId>

-    <name>Apache Tuscany SCA Definitions</name>

-    

-    <dependencies>

-    	<dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-extensibility</artifactId>

-            <version>2.0-M2-SNAPSHOT</version>

-        </dependency>

-    

-    	<dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-policy</artifactId>

-            <version>2.0-M2-SNAPSHOT</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-assembly-xsd</artifactId>

-            <version>2.0-M2-SNAPSHOT</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-</project>

diff --git a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java b/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
deleted file mode 100644
index 156fd0af75..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.definitions;
-
-import org.apache.tuscany.sca.definitions.impl.DefinitionsImpl;
-
-/**
- * Default Implementation of DefinitionsFactory
- */
-public class DefaultDefinitionsFactory implements DefinitionsFactory {
-
-    public Definitions createDefinitions() {
-        return new DefinitionsImpl();
-    }
-
-}
diff --git a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java b/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
deleted file mode 100644
index 812ed9fa02..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
+++ /dev/null
@@ -1,83 +0,0 @@
- /*

- * 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.definitions;

-

-import java.util.List;

-

-import org.apache.tuscany.sca.policy.BindingType;

-import org.apache.tuscany.sca.policy.ImplementationType;

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.PolicySet;

-

-

-/**

- * Represents SCA Definitions.

- *

- * @version $Rev$ $Date$

- */

-public interface Definitions {

-    /**

-     * Returns the target namespace for this SCA Definition

-     * @return the target namespace

-     */

-    String getTargetNamespace();

-    

-    /**

-     * Sets the target names for this SCA Definition.

-     * 

-     * @param ns the target namespace for this SCA Definition

-     */

-    void setTargetNamespace(String ns);

-

-    /**

-     * Returns a list of domain wide Policy Intents

-     * 

-     * @return a list of domain wide Policy Intents 

-     */

-    List<Intent> getIntents();

-    

-    /**

-     * Returns a list of domain wide PolicySets

-     * 

-     * @return a list of domain wide PolicySets 

-     */

-    List<PolicySet> getPolicySets();

-    

-    /**

-     * Returns a list of domain wide Binding Types

-     * 

-     * @return a list of domain wide Binding Types 

-     */

-    List<BindingType> getBindingTypes();

-    

-    

-    /**

-     * Returns a list of domain wide Implementation Types

-     * 

-     * @return a list of domain wide Implementation Types 

-     */

-    List<ImplementationType> getImplementationTypes();

-

-    /**

-     * Returns a list of domain wide binding definition objects

-     * 

-     * @return a list of domain wide binding definition objects 

-     */

-    List<Object> getBindings();

-}

diff --git a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java b/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
deleted file mode 100644
index 59cfa1e205..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*

- * 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.definitions;

-

-

-/**

- * Interface to abstract building of SCA Definitions for a Domain

- *

- * @version $Rev$ $Date$

- */

-public interface DefinitionsBuilder {

-    /**

-     * Builds the SCA definitions 

-     * 

-     * @param scaDefns

-     */

-    void build(Definitions scaDefns) throws DefinitionsBuilderException;

-}

diff --git a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java b/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
deleted file mode 100644
index e3a11d29aa..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*

- * 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.definitions;

-

-/**

- * Builder Exception

- *

- * @version $Rev$ $Date$

- */

-public class DefinitionsBuilderException extends Exception {

-    private static final long serialVersionUID = 2513219325230252783L;

-

-    public DefinitionsBuilderException() {

-    }

-

-    public DefinitionsBuilderException(String message) {

-        super(message);

-    }

-

-    public DefinitionsBuilderException(Throwable cause) {

-        super(cause);

-    }

-

-    public DefinitionsBuilderException(String message, Throwable cause) {

-        super(message, cause);

-    }

-}

diff --git a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java b/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
deleted file mode 100644
index 616616ae7a..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.definitions;
-
-/**
- * Factory interface to create SCA definitions model
- *
- */
-public interface DefinitionsFactory {
-    /**
-     * Create an instance of SCA definitions
-     * @return a new instance of SCA definitions
-     */
-    Definitions createDefinitions();
-}
diff --git a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java b/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
deleted file mode 100644
index 3ef7a2f4ae..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*

- * 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.definitions.impl;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.definitions.Definitions;

-import org.apache.tuscany.sca.definitions.DefinitionsBuilder;

-import org.apache.tuscany.sca.definitions.DefinitionsBuilderException;

-import org.apache.tuscany.sca.policy.BindingType;

-import org.apache.tuscany.sca.policy.ExtensionType;

-import org.apache.tuscany.sca.policy.ImplementationType;

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.IntentMap;

-import org.apache.tuscany.sca.policy.PolicySet;

-import org.apache.tuscany.sca.policy.Qualifier;

-

-/**

- * Provides a concrete implementation for a SCADefinitionsBuilder

- *

- * @version $Rev$ $Date$

- */

-public class DefinitionsBuilderImpl implements DefinitionsBuilder {

-

-    public void build(Definitions scaDefns) throws DefinitionsBuilderException {

-        Map<QName, Intent> definedIntents = new HashMap<QName, Intent>();

-        for (Intent intent : scaDefns.getIntents()) {

-            definedIntents.put(intent.getName(), intent);

-        }

-

-        Map<QName, PolicySet> definedPolicySets = new HashMap<QName, PolicySet>();

-        for (PolicySet policySet : scaDefns.getPolicySets()) {

-            definedPolicySets.put(policySet.getName(), policySet);

-        }

-

-        Map<QName, BindingType> definedBindingTypes = new HashMap<QName, BindingType>();

-        for (BindingType bindingType : scaDefns.getBindingTypes()) {

-            definedBindingTypes.put(bindingType.getType(), bindingType);

-        }

-

-        Map<QName, ImplementationType> definedImplTypes = new HashMap<QName, ImplementationType>();

-        for (ImplementationType implType : scaDefns.getImplementationTypes()) {

-            definedImplTypes.put(implType.getType(), implType);

-        }

-

-        //filling up the maps removes all duplicate entries... so fill this unique lists

-        //into the scaDefns.

-        scaDefns.getIntents().clear();

-        scaDefns.getPolicySets().clear();

-        scaDefns.getBindingTypes().clear();

-        scaDefns.getImplementationTypes().clear();

-

-        scaDefns.getIntents().addAll(definedIntents.values());

-        scaDefns.getPolicySets().addAll(definedPolicySets.values());

-        scaDefns.getBindingTypes().addAll(definedBindingTypes.values());

-        scaDefns.getImplementationTypes().addAll(definedImplTypes.values());

-

-        buildPolicyIntents(scaDefns, definedIntents);

-        buildPolicySets(scaDefns, definedPolicySets, definedIntents);

-        buildBindingTypes(scaDefns, definedBindingTypes, definedIntents);

-        buildImplementationTypes(scaDefns, definedImplTypes, definedIntents);

-    }

-

-    private void buildBindingTypes(Definitions scaDefns,

-                                   Map<QName, BindingType> definedBindingTypes,

-                                   Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {

-        for (BindingType bindingType : scaDefns.getBindingTypes()) {

-            buildAlwaysProvidedIntents(bindingType, definedIntents);

-            buildMayProvideIntents(bindingType, definedIntents);

-        }

-

-    }

-

-    private void buildImplementationTypes(Definitions scaDefns,

-                                          Map<QName, ImplementationType> definedImplTypes,

-                                          Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {

-        for (ImplementationType implType : scaDefns.getImplementationTypes()) {

-            buildAlwaysProvidedIntents(implType, definedIntents);

-            buildMayProvideIntents(implType, definedIntents);

-        }

-    }

-

-    private void buildPolicyIntents(Definitions scaDefns, Map<QName, Intent> definedIntents)

-        throws DefinitionsBuilderException {

-        for (Intent policyIntent : scaDefns.getIntents()) {

-            if (!policyIntent.getRequiredIntents().isEmpty()) {

-                buildProfileIntent(policyIntent, definedIntents);

-            }

-

-            if (!policyIntent.getQualifiedIntents().isEmpty()) {

-                buildQualifiedIntent(policyIntent, definedIntents);

-            }

-        }

-    }

-

-    private void buildPolicySets(Definitions scaDefns,

-                                 Map<QName, PolicySet> definedPolicySets,

-                                 Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {

-

-        for (PolicySet policySet : scaDefns.getPolicySets()) {

-            buildProvidedIntents(policySet, definedIntents);

-            buildIntentsInMappedPolicies(policySet, definedIntents);

-            buildReferredPolicySets(policySet, definedPolicySets);

-        }

-

-        for (PolicySet policySet : scaDefns.getPolicySets()) {

-            for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {

-                includeReferredPolicySets(policySet, referredPolicySet);

-            }

-        }

-    }

-

-    private void buildProfileIntent(Intent policyIntent, Map<QName, Intent> definedIntents)

-        throws DefinitionsBuilderException {

-        //FIXME: Need to check for cyclic references first i.e an A requiring B and then B requiring A... 

-        if (policyIntent != null) {

-            //resolve all required intents

-            List<Intent> requiredIntents = new ArrayList<Intent>();

-            for (Intent requiredIntent : policyIntent.getRequiredIntents()) {

-                if (requiredIntent.isUnresolved()) {

-                    Intent resolvedRequiredIntent = definedIntents.get(requiredIntent.getName());

-                    if (resolvedRequiredIntent != null) {

-                        requiredIntents.add(resolvedRequiredIntent);

-                    } else {

-                        throw new DefinitionsBuilderException("Required Intent - " + requiredIntent

-                            + " not found for ProfileIntent "

-                            + policyIntent);

-

-                    }

-                } else {

-                    requiredIntents.add(requiredIntent);

-                }

-            }

-            policyIntent.getRequiredIntents().clear();

-            policyIntent.getRequiredIntents().addAll(requiredIntents);

-        }

-    }

-

-    private void buildQualifiedIntent(Intent policyIntent, Map<QName, Intent> definedIntents)

-        throws DefinitionsBuilderException {

-        /*

-        if (policyIntent != null) {

-            //resolve the qualifiable intent

-            Intent qualifiableIntent = policyIntent.getQualifiableIntent();

-            if (qualifiableIntent.isUnresolved()) {

-                Intent resolvedQualifiableIntent = definedIntents.get(qualifiableIntent.getName());

-

-                if (resolvedQualifiableIntent != null) {

-                    policyIntent.setQualifiableIntent(resolvedQualifiableIntent);

-                } else {

-                    throw new DefinitionsBuilderException("Qualifiable Intent - " + qualifiableIntent

-                        + " not found for QualifiedIntent "

-                        + policyIntent);

-                }

-

-            }

-        }

-        */

-    }

-

-    private void buildAlwaysProvidedIntents(ExtensionType extensionType, Map<QName, Intent> definedIntents)

-        throws DefinitionsBuilderException {

-        if (extensionType != null) {

-            // resolve all provided intents

-            List<Intent> alwaysProvided = new ArrayList<Intent>();

-            for (Intent providedIntent : extensionType.getAlwaysProvidedIntents()) {

-                if (providedIntent.isUnresolved()) {

-                    Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName());

-                    if (resolvedProvidedIntent != null) {

-                        alwaysProvided.add(resolvedProvidedIntent);

-                    } else {

-                        throw new DefinitionsBuilderException("Always Provided Intent - " + providedIntent

-                            + " not found for ExtensionType "

-                            + extensionType);

-

-                    }

-                } else {

-                    alwaysProvided.add(providedIntent);

-                }

-            }

-            extensionType.getAlwaysProvidedIntents().clear();

-            extensionType.getAlwaysProvidedIntents().addAll(alwaysProvided);

-        }

-    }

-

-    private void buildMayProvideIntents(ExtensionType extensionType, Map<QName, Intent> definedIntents)

-        throws DefinitionsBuilderException {

-        if (extensionType != null) {

-            // resolve all provided intents

-            List<Intent> mayProvide = new ArrayList<Intent>();

-            for (Intent providedIntent : extensionType.getMayProvidedIntents()) {

-                if (providedIntent.isUnresolved()) {

-                    Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName());

-                    if (resolvedProvidedIntent != null) {

-                        mayProvide.add(resolvedProvidedIntent);

-                    } else {

-                        throw new DefinitionsBuilderException("May Provide Intent - " + providedIntent

-                            + " not found for ExtensionType "

-                            + extensionType);

-

-                    }

-                } else {

-                    mayProvide.add(providedIntent);

-                }

-            }

-            extensionType.getMayProvidedIntents().clear();

-            extensionType.getMayProvidedIntents().addAll(mayProvide);

-        }

-    }

-

-    private void buildProvidedIntents(PolicySet policySet, Map<QName, Intent> definedIntents)

-        throws DefinitionsBuilderException {

-        if (policySet != null) {

-            //resolve all provided intents

-            List<Intent> providedIntents = new ArrayList<Intent>();

-            for (Intent providedIntent : policySet.getProvidedIntents()) {

-                if (providedIntent.isUnresolved()) {

-                    Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName());

-                    if (resolvedProvidedIntent != null) {

-                        providedIntents.add(resolvedProvidedIntent);

-                    } else {

-                        throw new DefinitionsBuilderException("Provided Intent - " + providedIntent

-                            + " not found for PolicySet "

-                            + policySet);

-

-                    }

-                } else {

-                    providedIntents.add(providedIntent);

-                }

-            }

-            policySet.getProvidedIntents().clear();

-            policySet.getProvidedIntents().addAll(providedIntents);

-        }

-    }

-

-    private void buildIntentsInMappedPolicies(PolicySet policySet, Map<QName, Intent> definedIntents)

-        throws DefinitionsBuilderException {

-        for (IntentMap intentMap : policySet.getIntentMaps()) {

-            for (Qualifier qualifier : intentMap.getQualifiers()) {

-                Intent mappedIntent = qualifier.getIntent();

-                if (mappedIntent.isUnresolved()) {

-                    Intent resolvedMappedIntent = definedIntents.get(mappedIntent.getName());

-

-                    if (resolvedMappedIntent != null) {

-                        qualifier.setIntent(resolvedMappedIntent);

-                    } else {

-                        throw new DefinitionsBuilderException("Mapped Intent - " + mappedIntent

-                            + " not found for PolicySet "

-                            + policySet);

-

-                    }

-                }

-            }

-        }

-    }

-

-    private void buildReferredPolicySets(PolicySet policySet, Map<QName, PolicySet> definedPolicySets)

-        throws DefinitionsBuilderException {

-

-        List<PolicySet> referredPolicySets = new ArrayList<PolicySet>();

-        for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {

-            if (referredPolicySet.isUnresolved()) {

-                PolicySet resolvedReferredPolicySet = definedPolicySets.get(referredPolicySet.getName());

-                if (resolvedReferredPolicySet != null) {

-                    referredPolicySets.add(resolvedReferredPolicySet);

-                } else {

-                    throw new DefinitionsBuilderException("Referred PolicySet - " + referredPolicySet

-                        + "not found for PolicySet - "

-                        + policySet);

-                }

-            } else {

-                referredPolicySets.add(referredPolicySet);

-            }

-        }

-        policySet.getReferencedPolicySets().clear();

-        policySet.getReferencedPolicySets().addAll(referredPolicySets);

-    }

-

-    private void includeReferredPolicySets(PolicySet policySet, PolicySet referredPolicySet) {

-        for (PolicySet furtherReferredPolicySet : referredPolicySet.getReferencedPolicySets()) {

-            includeReferredPolicySets(referredPolicySet, furtherReferredPolicySet);

-        }

-        policySet.getPolicies().addAll(referredPolicySet.getPolicies());

-        policySet.getIntentMaps().addAll(referredPolicySet.getIntentMaps());

-    }

-}

diff --git a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java b/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
deleted file mode 100644
index 31cb68b9a9..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*

- * 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.definitions.impl;

-

-import java.util.List;

-import java.util.concurrent.CopyOnWriteArrayList;

-

-import org.apache.tuscany.sca.definitions.Definitions;

-import org.apache.tuscany.sca.policy.BindingType;

-import org.apache.tuscany.sca.policy.ImplementationType;

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.PolicySet;

-

-/**

- * Provides a concrete implementation for SCADefinitions

- *

- * @version $Rev$ $Date$

- */

-public class DefinitionsImpl implements Definitions {

-    private String targetNamespace = null;

-    private List<Intent> intents = new CopyOnWriteArrayList<Intent>();

-    private List<PolicySet> policySets = new CopyOnWriteArrayList<PolicySet>();

-    private List<BindingType> bindingTypes = new CopyOnWriteArrayList<BindingType>();

-    private List<ImplementationType> implementationTypes = new CopyOnWriteArrayList<ImplementationType>();

-    private List<Object> bindings = new CopyOnWriteArrayList<Object>();

-

-   

-    public List<BindingType> getBindingTypes() {

-        return bindingTypes;

-    }

-

-    public List<ImplementationType> getImplementationTypes() {

-        return implementationTypes;

-    }

-

-    public List<Intent> getIntents() {

-        return intents;

-    }

-

-    public List<PolicySet> getPolicySets() {

-        return policySets;

-    }

-

-    public String getTargetNamespace() {

-        return targetNamespace;

-    }

-

-    public void setTargetNamespace(String ns) {

-       this.targetNamespace = ns;

-    }

-

-    public List<Object> getBindings() {

-        return bindings;

-    }

-}

diff --git a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java b/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
deleted file mode 100644
index 0ff2f81a9a..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*

- * 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.definitions.util;

-

-import org.apache.tuscany.sca.definitions.Definitions;

-

-/**

- * Some utility functions to deal with SCADefinitions

- *

- * @version $Rev$ $Date$

- */

-public class DefinitionsUtil {

-    

-    public static void aggregate(Definitions source, Definitions target) {

-        target.getIntents().addAll(source.getIntents());

-        target.getPolicySets().addAll(source.getPolicySets());

-        target.getBindingTypes().addAll(source.getBindingTypes());

-        target.getImplementationTypes().addAll(source.getImplementationTypes());

-        target.getBindings().addAll(source.getBindings());

-    }

-    

-}

diff --git a/branches/sca-java-2.0-M2/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory b/branches/sca-java-2.0-M2/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
deleted file mode 100644
index 521d94f518..0000000000
--- a/branches/sca-java-2.0-M2/modules/definitions/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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. 

-org.apache.tuscany.sca.definitions.DefaultDefinitionsFactory
\ No newline at end of file