diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:09:08 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-11 23:09:08 +0000 |
commit | cde3d2629677a07aa09e3c7fbe117b680c0f5df7 (patch) | |
tree | c6d50048ffad8dfa8a1c0019e7afb207cb6b4fe2 /branches/sca-equinox/modules/data-api | |
parent | 4ef0430519e276c2bdecea75f7a0f42f49f0cf30 (diff) |
Moving 2.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835133 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-equinox/modules/data-api')
10 files changed, 0 insertions, 692 deletions
diff --git a/branches/sca-equinox/modules/data-api/LICENSE b/branches/sca-equinox/modules/data-api/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/branches/sca-equinox/modules/data-api/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-equinox/modules/data-api/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/data-api/META-INF/MANIFEST.MF deleted file mode 100644 index 3776d4802a..0000000000 --- a/branches/sca-equinox/modules/data-api/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.data.collection;uses:="org.osoa
- .sca.annotations";version="1.4"
-Tool: Bnd-0.0.255
-Bundle-Name: Apache Tuscany SCA Data API
-Created-By: 1.6.0_07 (Sun Microsystems Inc.)
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.4
-Bnd-LastModified: 1225397254562
-Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany SCA Data API
-Import-Package: org.apache.tuscany.sca.data.collection;version="1.4",o
- rg.osoa.sca.annotations;version="1.4"
-Bundle-SymbolicName: org.apache.tuscany.sca.data.api
-Bundle-DocURL: http://www.apache.org/
-
diff --git a/branches/sca-equinox/modules/data-api/NOTICE b/branches/sca-equinox/modules/data-api/NOTICE deleted file mode 100644 index fdfa0e9faa..0000000000 --- a/branches/sca-equinox/modules/data-api/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2008 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-equinox/modules/data-api/pom.xml b/branches/sca-equinox/modules/data-api/pom.xml deleted file mode 100644 index 40130243c7..0000000000 --- a/branches/sca-equinox/modules/data-api/pom.xml +++ /dev/null @@ -1,39 +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>1.4-EQUINOX-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-data-api</artifactId>
- <name>Apache Tuscany SCA Data API</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4-EQUINOX-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java b/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java deleted file mode 100644 index f559d5d914..0000000000 --- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java +++ /dev/null @@ -1,78 +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.data.collection; - -import org.osoa.sca.annotations.Remotable; - -/** - * Provides access to a collection of data items. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface Collection <K, D> { - - /** - * Get the whole collection. - * - * @return the whole collection. - */ - Entry<K, D>[] getAll(); - - /** - * Returns a collection resulting from a query. - * - * @return the collection. - */ - Entry<K, D>[] query(String queryString); - - /** - * Creates a new item. - * - * @param key - * @param item - * @return - */ - K post(K key, D item); - - /** - * Retrieves an item. - * - * @param key - * @return - */ - D get(K key) throws NotFoundException; - - /** - * Updates an item. - * - * @param key - * @param item - * @return - */ - void put(K key, D item) throws NotFoundException; - - /** - * Delete an item. - * - * @param key - */ - void delete(K key) throws NotFoundException; - -} diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java b/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java deleted file mode 100644 index 5903fd95a4..0000000000 --- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java +++ /dev/null @@ -1,85 +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.data.collection; - - -/** - * Represents a key/data pair in a data collection. - * - * @version $Rev$ $Date$ - */ -public class Entry <K, D> { - - private K key; - private D data; - - /** - * Constructs a new entry. - */ - public Entry() { - } - - /** - * Constructs a new entry. - * @param key the entry key - * @param data the entry data - */ - public Entry(K key, D data) { - this.key = key; - this.data = data; - } - - /** - * Returns the entry key. - * @return the key - */ - public K getKey() { - return key; - } - - /** - * Sets the entry key. - * @param key the key - */ - public void setKey(K key) { - this.key = key; - } - - /** - * Returns the entry data. - * @return the entry data - */ - public D getData() { - return data; - } - - /** - * Sets the entry data - * @param data the entry data - */ - public void setData(D data) { - this.data = data; - } - - //FIXME Temporary methods to make JAXB register the Item - // class when the Entry class is registered in a JAXB context - public void setDummy(Item item) {} - public Item getDummy() { return null; } - -} diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java b/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java deleted file mode 100644 index 37042c0895..0000000000 --- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java +++ /dev/null @@ -1,159 +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.data.collection; - -import java.util.Date; - - -/** - * Represents a data item. - * - * @version $Rev$ $Date$ - */ -public class Item { - - private String title; - private String contents; - private String link; - private String related; - private String alternate; - private Date date; - - /** - * Constructs a new item. - */ - public Item() { - } - - /** - * Constructs a new item. - * @param title the item title - * @param contents the item contents - * @param link the item link to a web resource - * @param related the item link to a related web resource - * @param date the item date - */ - public Item(String title, String contents, String link, String related, Date date) { - this.title = title; - this.contents = contents; - this.link = link; - this.related = related; - this.date = date; - } - - /** - * Returns the item title. - * @return the item title - */ - public String getTitle() { - return title; - } - - /** - * Sets the item title. - * @param title the item title - */ - public void setTitle(String title) { - this.title = title; - } - - /** - * Returns the item contents - * @return the item contents - */ - public String getContents() { - return contents; - } - - /** - * Sets the item contents - * @param contents the item contents - */ - public void setContents(String contents) { - this.contents = contents; - } - - /** - * Returns the item link to a web resource - * @return the item link to a web resource - */ - public String getLink() { - return link; - } - - /** - * Sets the item link to a web resource - * @param link the item link to a web resource - */ - public void setLink(String link) { - this.link = link; - } - - /** - * Returns the item link to a related web resource - * @return the item link to a related web resource - */ - public String getRelated() { - return related; - } - - /** - * Sets the item link to a related web resource. - * - * @param related the item link to a related web resource - */ - public void setRelated(String related) { - this.related = related; - } - - /** - * Returns the item link to an alternate web resource - * @return the item link to an alternate web resource - */ - public String getAlternate() { - return alternate; - } - - /** - * Sets the item link to an alternate web resource. - * - * @param alternate the item link to an alternate web resource - */ - public void setAlternate(String alternate) { - this.alternate = alternate; - } - - /** - * Returns the item date - * @return the item date - */ - public Date getDate() { - return date; - } - - /** - * Sets the item date - * @param date the item date - */ - public void setDate(Date date) { - this.date = date; - } - - -} diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java b/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java deleted file mode 100644 index c30bbc771a..0000000000 --- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java +++ /dev/null @@ -1,30 +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.data.collection; - -import org.osoa.sca.annotations.Remotable; - -/** - * Provides access to a collection of data items. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface ItemCollection extends Collection<String, Item> { -} diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java b/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java deleted file mode 100644 index 69512058b7..0000000000 --- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java +++ /dev/null @@ -1,28 +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.data.collection; - - -/** - * Provides access to a collection of data items. - * - * @version $Rev$ $Date$ - */ -public interface LocalItemCollection extends Collection<String, Item> { -} diff --git a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java b/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java deleted file mode 100644 index 7f13db5228..0000000000 --- a/branches/sca-equinox/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java +++ /dev/null @@ -1,45 +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.data.collection; - -/** - * Indicates that an item could not be found in a collection. - * - * @version $Rev$ $Date$ - */ -public class NotFoundException extends Exception { - private static final long serialVersionUID = 6792367409396084646L; - - public NotFoundException() { - } - - public NotFoundException(String message) { - super(message); - } - - public NotFoundException(Throwable cause) { - super(cause); - } - - public NotFoundException(String message, Throwable cause) { - super(message, cause); - } - -} |