[savara-commits] savara SVN: r296 - in trunk/tools/eclipse: org.jboss.savara.contract.model and 22 other directories.

Author: objectiser Date: 2010-07-06 16:09:53 -0400 (Tue, 06 Jul 2010) New Revision: 296 Added: trunk/tools/eclipse/org.jboss.savara.contract.model/ trunk/tools/eclipse/org.jboss.savara.contract.model/Copyright.txt trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/osgi/ Removed: trunk/tools/eclipse/org.jboss.savara.contract.model/LICENSE.txt trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/Contract.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/FaultDetails.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/Interface.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/MessageExchangePattern.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/Namespace.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/OneWayRequestMEP.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/RequestResponseMEP.java trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/osgi/ trunk/tools/eclipse/org.scribble.contract.model/ trunk/tools/eclipse/releng/build.properties trunk/tools/eclipse/releng/build.properties.example.hudson.qa.jboss.com trunk/tools/eclipse/releng/build.properties.example.linux trunk/tools/eclipse/releng/build.properties.example.windows trunk/tools/eclipse/releng/build.xml trunk/tools/eclipse/releng/hudson/ trunk/tools/eclipse/releng/jbosstools-trunk pi4soa releng build.xml.launch trunk/tools/eclipse/releng/maps/ trunk/tools/eclipse/releng/psfs/ trunk/tools/eclipse/releng/testing.properties Modified: trunk/tools/eclipse/org.jboss.savara.contract.model/.classpath trunk/tools/eclipse/org.jboss.savara.contract.model/.project trunk/tools/eclipse/org.jboss.savara.contract.model/META-INF/MANIFEST.MF trunk/tools/eclipse/org.jboss.savara.contract.model/build.properties trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/osgi/Activator.java trunk/tools/eclipse/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java trunk/tools/eclipse/org.jboss.savara.tools.wsdl.tests/META-INF/MANIFEST.MF trunk/tools/eclipse/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java trunk/tools/eclipse/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPDocLitWSDLBinding.java trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPRPCWSDLBinding.java trunk/tools/eclipse/org.scribble.feature/feature.xml trunk/tools/eclipse/org.scribble.pi4soa.cdm/META-INF/MANIFEST.MF trunk/tools/eclipse/org.scribble.pi4soa.cdm/src/java/org/scribble/pi4soa/cdm/parser/rules/ConversationConverterRuleImpl.java Log: Refactor contract model out of scribble plugins into Savara, to prepare for newer version of Scribble which is purely a behavioural protocol representation. Copied: trunk/tools/eclipse/org.jboss.savara.contract.model (from rev 283, trunk/tools/eclipse/org.scribble.contract.model) Property changes on: trunk/tools/eclipse/org.jboss.savara.contract.model ___________________________________________________________________ Name: svn:ignore + classes bin Modified: trunk/tools/eclipse/org.jboss.savara.contract.model/.classpath =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/.classpath 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/.classpath 2010-07-06 20:09:53 UTC (rev 296) @@ -3,5 +3,5 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/java"/> - <classpathentry kind="output" path="classes"/> + <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/tools/eclipse/org.jboss.savara.contract.model/.project =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/.project 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/.project 2010-07-06 20:09:53 UTC (rev 296) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.scribble.contract.model</name> + <name>org.jboss.savara.contract.model</name> <comment></comment> <projects> </projects> Added: trunk/tools/eclipse/org.jboss.savara.contract.model/Copyright.txt =================================================================== --- trunk/tools/eclipse/org.jboss.savara.contract.model/Copyright.txt (rev 0) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/Copyright.txt 2010-07-06 20:09:53 UTC (rev 296) @@ -0,0 +1,17 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ Deleted: trunk/tools/eclipse/org.jboss.savara.contract.model/LICENSE.txt =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/LICENSE.txt 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/LICENSE.txt 2010-07-06 20:09:53 UTC (rev 296) @@ -1,201 +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. Modified: trunk/tools/eclipse/org.jboss.savara.contract.model/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/META-INF/MANIFEST.MF 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/META-INF/MANIFEST.MF 2010-07-06 20:09:53 UTC (rev 296) @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Scribble Contract Model -Bundle-SymbolicName: org.scribble.contract.model -Bundle-Version: 0.1.0.qualifier -Bundle-Activator: org.scribble.contract.model.osgi.Activator -Bundle-Vendor: www.scribble.org +Bundle-Name: JBoss SAVARA Contract Model +Bundle-SymbolicName: org.jboss.savara.contract.model +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.jboss.savara.contract.model.osgi.Activator +Bundle-Vendor: www.jboss.org Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: org.scribble.core;bundle-version="0.1.0" -Export-Package: org.scribble.contract.model +Export-Package: org.jboss.savara.contract.model Modified: trunk/tools/eclipse/org.jboss.savara.contract.model/build.properties =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/build.properties 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/build.properties 2010-07-06 20:09:53 UTC (rev 296) @@ -1,4 +1,4 @@ source.. = src/java/ -output.. = classes/ +output.. = bin/ bin.includes = META-INF/,\ . Copied: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java (from rev 283, trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/Contract.java) =================================================================== --- trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java (rev 0) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Contract.java 2010-07-06 20:09:53 UTC (rev 296) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.contract.model; + +import org.scribble.model.ContainmentList; +import org.scribble.model.ModelObject; +import org.scribble.model.Reference; + +/** + * This class represents the contract. + */ +public class Contract extends ModelObject { + + private static final long serialVersionUID = 1826808390992159186L; + + /** + * The default constructor. + */ + public Contract() { + } + + /** + * This method returns the name associated with the + * contract. + * + * @return The name + */ + public String getName() { + return(m_name); + } + + /** + * This method sets the name of the contract. + * + * @param name The name + */ + public void setName(String name) { + m_name = name; + } + + /** + * This method returns the namespace associated with the + * contract. + * + * @return The namespace + */ + public String getNamespace() { + return(m_namespace); + } + + /** + * This method sets the namespace of the contract. + * + * @param namespace The namespace + */ + public void setNamespace(String namespace) { + m_namespace = namespace; + } + + /** + * This method returns the list of interfaces. + * + * @return The list of interfaces + */ + @Reference(containment=true) + public java.util.List<Interface> getInterfaces() { + return(m_interfaces); + } + + /** + * This method returns the list of namespaces. + * If a namespace is used in the contract that does + * not exist in this list, then a dynamic prefix should + * be created for the namespace. + * + * @return The list of namespaces + */ + @Reference(containment=true) + public java.util.List<Namespace> getNamespaces() { + return(m_namespaces); + } + + private String m_name=null; + private String m_namespace=null; + private java.util.List<Interface> m_interfaces= + new ContainmentList<Interface>(this, Interface.class); + private java.util.List<Namespace> m_namespaces= + new java.util.Vector<Namespace>(); +} Copied: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java (from rev 283, trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/FaultDetails.java) =================================================================== --- trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java (rev 0) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/FaultDetails.java 2010-07-06 20:09:53 UTC (rev 296) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.contract.model; + +import org.scribble.model.ContainmentList; +import org.scribble.model.ModelObject; +import org.scribble.model.Reference; +import org.scribble.model.TypeReference; + +/** + * This class represents the fault details. + */ +public class FaultDetails extends ModelObject { + + private static final long serialVersionUID = 3197411493758826511L; + + /** + * The default constructor. + */ + public FaultDetails() { + } + + /** + * This method returns the name associated with the + * fault. + * + * @return The name + */ + public String getName() { + return(m_name); + } + + /** + * This method sets the name of the fault. + * + * @param name The name + */ + public void setName(String name) { + m_name = name; + } + + /** + * This method returns the namespace associated with the + * fault. + * + * @return The namespace + */ + public String getNamespace() { + return(m_namespace); + } + + /** + * This method sets the namespace of the fault. + * + * @param namespace The namespace + */ + public void setNamespace(String namespace) { + m_namespace = namespace; + } + + /** + * This method returns the list of type references. + * + * @return The list of type references + */ + @Reference(containment=true) + public java.util.List<TypeReference> getTypes() { + return(m_types); + } + + private String m_name=null; + private String m_namespace=null; + private java.util.List<TypeReference> m_types= + new ContainmentList<TypeReference>(this, TypeReference.class); +} Copied: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java (from rev 283, trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/Interface.java) =================================================================== --- trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java (rev 0) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Interface.java 2010-07-06 20:09:53 UTC (rev 296) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.contract.model; + +import org.scribble.model.ContainmentList; +import org.scribble.model.ModelObject; +import org.scribble.model.Reference; + +/** + * This class represents an interface, as part of a contract. + * + */ +public class Interface extends ModelObject { + + private static final long serialVersionUID = -5867002445215817481L; + + /** + * The default constructor. + */ + public Interface() { + } + + /** + * This method returns the name associated with the + * interface. + * + * @return The name + */ + public String getName() { + return(m_name); + } + + /** + * This method sets the name of the interface. + * + * @param name The name + */ + public void setName(String name) { + m_name = name; + } + + /** + * This method returns the namespace associated with the + * interface. + * + * @return The namespace + */ + public String getNamespace() { + return(m_namespace); + } + + /** + * This method sets the namespace of the interface. + * + * @param namespace The namespace + */ + public void setNamespace(String namespace) { + m_namespace = namespace; + } + + /** + * This method returns the list of message exchange patterns. + * + * @return The list of message exchange patterns + */ + @Reference(containment=true) + public java.util.List<MessageExchangePattern> getMessageExchangePatterns() { + return(m_messageExchangePatterns); + } + + private String m_name=null; + private String m_namespace=null; + private java.util.List<MessageExchangePattern> m_messageExchangePatterns= + new ContainmentList<MessageExchangePattern>(this, MessageExchangePattern.class); +} Copied: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java (from rev 283, trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/MessageExchangePattern.java) =================================================================== --- trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java (rev 0) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/MessageExchangePattern.java 2010-07-06 20:09:53 UTC (rev 296) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.contract.model; + +import org.scribble.model.ContainmentList; +import org.scribble.model.ModelObject; +import org.scribble.model.Reference; +import org.scribble.model.TypeReference; + +/** + * This class represents the message exchange pattern. + */ +public abstract class MessageExchangePattern extends ModelObject { + + private static final long serialVersionUID = 6024134205644784735L; + + /** + * The default constructor. + */ + public MessageExchangePattern() { + } + + /** + * This method returns the optional operation. + * + * @return The optional operation + */ + public String getOperation() { + return(m_operation); + } + + /** + * This method sets the operation. + * + * @param operation The operation + */ + public void setOperation(String operation) { + m_operation = operation; + } + + /** + * This method returns the list of type references. If + * no operation is defined, then only one type reference + * should be defined. + * + * @return The list of type references + */ + @Reference(containment=true) + public java.util.List<TypeReference> getTypes() { + return(m_types); + } + + private String m_operation=null; + private java.util.List<TypeReference> m_types= + new ContainmentList<TypeReference>(this, TypeReference.class); +} Copied: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java (from rev 283, trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/Namespace.java) =================================================================== --- trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java (rev 0) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/Namespace.java 2010-07-06 20:09:53 UTC (rev 296) @@ -0,0 +1,95 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.contract.model; + +import org.scribble.model.ModelObject; + +/** + * This class represents the namespace. + */ +public class Namespace extends ModelObject { + + private static final long serialVersionUID = -2756456243428682166L; + + /** + * The default constructor. + */ + public Namespace() { + } + + /** + * This method returns the prefix associated with the + * prefix. + * + * @return The name + */ + public String getPrefix() { + return(m_prefix); + } + + /** + * This method sets the prefix of the namespace. + * + * @param prefix The prefix + */ + public void setPrefix(String prefix) { + m_prefix = prefix; + } + + /** + * This method returns the URI associated with the + * namespace. + * + * @return The URI + */ + public String getURI() { + return(m_uri); + } + + /** + * This method sets the URI of the namespace. + * + * @param uri The URI + */ + public void setURI(String uri) { + m_uri = uri; + } + + /** + * This method returns the schema location associated with the + * namespace. + * + * @return The URI + */ + public String getSchemaLocation() { + return(m_schemaLocation); + } + + /** + * This method sets the schema location of the namespace. + * + * @param schemaLocation The optional schema location + */ + public void setSchemaLocation(String schemaLocation) { + m_schemaLocation = schemaLocation; + } + + private String m_prefix=null; + private String m_uri=null; + private String m_schemaLocation=null; +} Copied: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java (from rev 283, trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/OneWayRequestMEP.java) =================================================================== --- trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java (rev 0) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/OneWayRequestMEP.java 2010-07-06 20:09:53 UTC (rev 296) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.contract.model; + +/** + * This class represents the one-way message exchange pattern. + */ +public class OneWayRequestMEP extends MessageExchangePattern { + + private static final long serialVersionUID = 1798545946621135972L; + + /** + * The default constructor. + */ + public OneWayRequestMEP() { + } + +} Copied: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java (from rev 283, trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/RequestResponseMEP.java) =================================================================== --- trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java (rev 0) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/RequestResponseMEP.java 2010-07-06 20:09:53 UTC (rev 296) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.contract.model; + +import org.scribble.model.ContainmentList; +import org.scribble.model.Reference; +import org.scribble.model.TypeReference; + +/** + * This class represents the request response message exchange pattern. + */ +public class RequestResponseMEP extends MessageExchangePattern { + + private static final long serialVersionUID = -2468151434616043577L; + + /** + * The default constructor. + */ + public RequestResponseMEP() { + } + + /** + * This method returns the list of response type references. + * + * @return The list of response type references + */ + @Reference(containment=true) + public java.util.List<TypeReference> getResponseTypes() { + return(m_responseTypes); + } + + /** + * This method returns the list of fault details. + * + * @return The list of fault details + */ + @Reference(containment=true) + public java.util.List<FaultDetails> getFaultDetails() { + return(m_faultDetails); + } + + private java.util.List<TypeReference> m_responseTypes= + new ContainmentList<TypeReference>(this, TypeReference.class); + private java.util.List<FaultDetails> m_faultDetails= + new ContainmentList<FaultDetails>(this, FaultDetails.class); +} Copied: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/osgi (from rev 283, trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/osgi) Modified: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/osgi/Activator.java =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/osgi/Activator.java 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/jboss/savara/contract/model/osgi/Activator.java 2010-07-06 20:09:53 UTC (rev 296) @@ -1,4 +1,21 @@ -package org.scribble.contract.model.osgi; +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.contract.model.osgi; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Deleted: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/Contract.java =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/Contract.java 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/Contract.java 2010-07-06 20:09:53 UTC (rev 296) @@ -1,106 +0,0 @@ -/* - * Copyright 2007-9 Pi4 Technologies Ltd - * - * 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. - * - * - * Change History: - * 25 Sept 2009 : Initial version created by gary - */ -package org.scribble.contract.model; - -import org.scribble.model.ContainmentList; -import org.scribble.model.ModelObject; -import org.scribble.model.Reference; - -/** - * This class represents the contract. - */ -public class Contract extends ModelObject { - - private static final long serialVersionUID = 1826808390992159186L; - - /** - * The default constructor. - */ - public Contract() { - } - - /** - * This method returns the name associated with the - * contract. - * - * @return The name - */ - public String getName() { - return(m_name); - } - - /** - * This method sets the name of the contract. - * - * @param name The name - */ - public void setName(String name) { - m_name = name; - } - - /** - * This method returns the namespace associated with the - * contract. - * - * @return The namespace - */ - public String getNamespace() { - return(m_namespace); - } - - /** - * This method sets the namespace of the contract. - * - * @param namespace The namespace - */ - public void setNamespace(String namespace) { - m_namespace = namespace; - } - - /** - * This method returns the list of interfaces. - * - * @return The list of interfaces - */ - @Reference(containment=true) - public java.util.List<Interface> getInterfaces() { - return(m_interfaces); - } - - /** - * This method returns the list of namespaces. - * If a namespace is used in the contract that does - * not exist in this list, then a dynamic prefix should - * be created for the namespace. - * - * @return The list of namespaces - */ - @Reference(containment=true) - public java.util.List<Namespace> getNamespaces() { - return(m_namespaces); - } - - private String m_name=null; - private String m_namespace=null; - private java.util.List<Interface> m_interfaces= - new ContainmentList<Interface>(this, Interface.class); - private java.util.List<Namespace> m_namespaces= - new java.util.Vector<Namespace>(); -} Deleted: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/FaultDetails.java =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/FaultDetails.java 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/FaultDetails.java 2010-07-06 20:09:53 UTC (rev 296) @@ -1,92 +0,0 @@ -/* - * Copyright 2007-9 Pi4 Technologies Ltd - * - * 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. - * - * - * Change History: - * 25 Sept 2009 : Initial version created by gary - */ -package org.scribble.contract.model; - -import org.scribble.model.ContainmentList; -import org.scribble.model.ModelObject; -import org.scribble.model.Reference; -import org.scribble.model.TypeReference; - -/** - * This class represents the fault details. - */ -public class FaultDetails extends ModelObject { - - private static final long serialVersionUID = 3197411493758826511L; - - /** - * The default constructor. - */ - public FaultDetails() { - } - - /** - * This method returns the name associated with the - * fault. - * - * @return The name - */ - public String getName() { - return(m_name); - } - - /** - * This method sets the name of the fault. - * - * @param name The name - */ - public void setName(String name) { - m_name = name; - } - - /** - * This method returns the namespace associated with the - * fault. - * - * @return The namespace - */ - public String getNamespace() { - return(m_namespace); - } - - /** - * This method sets the namespace of the fault. - * - * @param namespace The namespace - */ - public void setNamespace(String namespace) { - m_namespace = namespace; - } - - /** - * This method returns the list of type references. - * - * @return The list of type references - */ - @Reference(containment=true) - public java.util.List<TypeReference> getTypes() { - return(m_types); - } - - private String m_name=null; - private String m_namespace=null; - private java.util.List<TypeReference> m_types= - new ContainmentList<TypeReference>(this, TypeReference.class); -} Deleted: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/Interface.java =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/Interface.java 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/Interface.java 2010-07-06 20:09:53 UTC (rev 296) @@ -1,92 +0,0 @@ -/* - * Copyright 2007-9 Pi4 Technologies Ltd - * - * 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. - * - * - * Change History: - * 26 Sept 2009 : Initial version created by gary - */ -package org.scribble.contract.model; - -import org.scribble.model.ContainmentList; -import org.scribble.model.ModelObject; -import org.scribble.model.Reference; - -/** - * This class represents an interface, as part of a contract. - * - */ -public class Interface extends ModelObject { - - private static final long serialVersionUID = -5867002445215817481L; - - /** - * The default constructor. - */ - public Interface() { - } - - /** - * This method returns the name associated with the - * interface. - * - * @return The name - */ - public String getName() { - return(m_name); - } - - /** - * This method sets the name of the interface. - * - * @param name The name - */ - public void setName(String name) { - m_name = name; - } - - /** - * This method returns the namespace associated with the - * interface. - * - * @return The namespace - */ - public String getNamespace() { - return(m_namespace); - } - - /** - * This method sets the namespace of the interface. - * - * @param namespace The namespace - */ - public void setNamespace(String namespace) { - m_namespace = namespace; - } - - /** - * This method returns the list of message exchange patterns. - * - * @return The list of message exchange patterns - */ - @Reference(containment=true) - public java.util.List<MessageExchangePattern> getMessageExchangePatterns() { - return(m_messageExchangePatterns); - } - - private String m_name=null; - private String m_namespace=null; - private java.util.List<MessageExchangePattern> m_messageExchangePatterns= - new ContainmentList<MessageExchangePattern>(this, MessageExchangePattern.class); -} Deleted: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/MessageExchangePattern.java =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/MessageExchangePattern.java 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/MessageExchangePattern.java 2010-07-06 20:09:53 UTC (rev 296) @@ -1,73 +0,0 @@ -/* - * Copyright 2007-9 Pi4 Technologies Ltd - * - * 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. - * - * - * Change History: - * 25 Sept 2009 : Initial version created by gary - */ -package org.scribble.contract.model; - -import org.scribble.model.ContainmentList; -import org.scribble.model.ModelObject; -import org.scribble.model.Reference; -import org.scribble.model.TypeReference; - -/** - * This class represents the message exchange pattern. - */ -public abstract class MessageExchangePattern extends ModelObject { - - private static final long serialVersionUID = 6024134205644784735L; - - /** - * The default constructor. - */ - public MessageExchangePattern() { - } - - /** - * This method returns the optional operation. - * - * @return The optional operation - */ - public String getOperation() { - return(m_operation); - } - - /** - * This method sets the operation. - * - * @param operation The operation - */ - public void setOperation(String operation) { - m_operation = operation; - } - - /** - * This method returns the list of type references. If - * no operation is defined, then only one type reference - * should be defined. - * - * @return The list of type references - */ - @Reference(containment=true) - public java.util.List<TypeReference> getTypes() { - return(m_types); - } - - private String m_operation=null; - private java.util.List<TypeReference> m_types= - new ContainmentList<TypeReference>(this, TypeReference.class); -} Deleted: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/Namespace.java =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/Namespace.java 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/Namespace.java 2010-07-06 20:09:53 UTC (rev 296) @@ -1,97 +0,0 @@ -/* - * Copyright 2007-9 Pi4 Technologies Ltd - * - * 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. - * - * - * Change History: - * 10 October 2009 : Initial version created by gary - */ -package org.scribble.contract.model; - -import org.scribble.model.ModelObject; - -/** - * This class represents the namespace. - */ -public class Namespace extends ModelObject { - - private static final long serialVersionUID = -2756456243428682166L; - - /** - * The default constructor. - */ - public Namespace() { - } - - /** - * This method returns the prefix associated with the - * prefix. - * - * @return The name - */ - public String getPrefix() { - return(m_prefix); - } - - /** - * This method sets the prefix of the namespace. - * - * @param prefix The prefix - */ - public void setPrefix(String prefix) { - m_prefix = prefix; - } - - /** - * This method returns the URI associated with the - * namespace. - * - * @return The URI - */ - public String getURI() { - return(m_uri); - } - - /** - * This method sets the URI of the namespace. - * - * @param uri The URI - */ - public void setURI(String uri) { - m_uri = uri; - } - - /** - * This method returns the schema location associated with the - * namespace. - * - * @return The URI - */ - public String getSchemaLocation() { - return(m_schemaLocation); - } - - /** - * This method sets the schema location of the namespace. - * - * @param schemaLocation The optional schema location - */ - public void setSchemaLocation(String schemaLocation) { - m_schemaLocation = schemaLocation; - } - - private String m_prefix=null; - private String m_uri=null; - private String m_schemaLocation=null; -} Deleted: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/OneWayRequestMEP.java =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/OneWayRequestMEP.java 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/OneWayRequestMEP.java 2010-07-06 20:09:53 UTC (rev 296) @@ -1,35 +0,0 @@ -/* - * Copyright 2007-9 Pi4 Technologies Ltd - * - * 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. - * - * - * Change History: - * 25 Sept 2009 : Initial version created by gary - */ -package org.scribble.contract.model; - -/** - * This class represents the one-way message exchange pattern. - */ -public class OneWayRequestMEP extends MessageExchangePattern { - - private static final long serialVersionUID = 1798545946621135972L; - - /** - * The default constructor. - */ - public OneWayRequestMEP() { - } - -} Deleted: trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/RequestResponseMEP.java =================================================================== --- trunk/tools/eclipse/org.scribble.contract.model/src/java/org/scribble/contract/model/RequestResponseMEP.java 2010-06-22 19:05:26 UTC (rev 283) +++ trunk/tools/eclipse/org.jboss.savara.contract.model/src/java/org/scribble/contract/model/RequestResponseMEP.java 2010-07-06 20:09:53 UTC (rev 296) @@ -1,63 +0,0 @@ -/* - * Copyright 2007-9 Pi4 Technologies Ltd - * - * 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. - * - * - * Change History: - * 25 Sept 2009 : Initial version created by gary - */ -package org.scribble.contract.model; - -import org.scribble.model.ContainmentList; -import org.scribble.model.Reference; -import org.scribble.model.TypeReference; - -/** - * This class represents the request response message exchange pattern. - */ -public class RequestResponseMEP extends MessageExchangePattern { - - private static final long serialVersionUID = -2468151434616043577L; - - /** - * The default constructor. - */ - public RequestResponseMEP() { - } - - /** - * This method returns the list of response type references. - * - * @return The list of response type references - */ - @Reference(containment=true) - public java.util.List<TypeReference> getResponseTypes() { - return(m_responseTypes); - } - - /** - * This method returns the list of fault details. - * - * @return The list of fault details - */ - @Reference(containment=true) - public java.util.List<FaultDetails> getFaultDetails() { - return(m_faultDetails); - } - - private java.util.List<TypeReference> m_responseTypes= - new ContainmentList<TypeReference>(this, TypeReference.class); - private java.util.List<FaultDetails> m_faultDetails= - new ContainmentList<FaultDetails>(this, FaultDetails.class); -} Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF 2010-07-06 20:09:53 UTC (rev 296) @@ -17,7 +17,7 @@ org.apache.commons.logging, org.scribble.expression.xpath, org.scribble.pi4soa.cdm;resolution:=optional, - org.scribble.contract.model, + org.jboss.savara.contract.model, org.jboss.savara.tools.wsdl, org.eclipse.ui.ide, org.eclipse.jst.common.frameworks, Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-07-06 20:09:53 UTC (rev 296) @@ -35,9 +35,9 @@ import org.jboss.savara.tools.bpel.util.XMLUtils; import org.jboss.savara.tools.wsdl.generator.WSDLGeneratorUtil; import org.jboss.savara.tools.wsdl.generator.soap.*; -import org.scribble.contract.model.Contract; -import org.scribble.contract.model.Interface; -import org.scribble.contract.model.Namespace; +import org.jboss.savara.contract.model.Contract; +import org.jboss.savara.contract.model.Interface; +import org.jboss.savara.contract.model.Namespace; import org.scribble.conversation.model.*; import org.scribble.extensions.RegistryFactory; import org.scribble.model.*; @@ -195,9 +195,9 @@ // Transfer contract details (if defined) from local model // reference to role - if (localModelRef.getAnnotations().containsKey(org.scribble.contract.model.Contract.class.getName())) { - role.getAnnotations().put(org.scribble.contract.model.Contract.class.getName(), - localModelRef.getAnnotations().get(org.scribble.contract.model.Contract.class.getName())); + if (localModelRef.getAnnotations().containsKey(org.jboss.savara.contract.model.Contract.class.getName())) { + role.getAnnotations().put(org.jboss.savara.contract.model.Contract.class.getName(), + localModelRef.getAnnotations().get(org.jboss.savara.contract.model.Contract.class.getName())); } ModelReference srcRef= Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java 2010-07-06 20:09:53 UTC (rev 296) @@ -23,7 +23,7 @@ import org.jboss.savara.tools.bpel.model.component.Import; import org.scribble.model.*; import org.scribble.model.change.*; -import org.scribble.contract.model.Contract; +import org.jboss.savara.contract.model.Contract; import org.scribble.conversation.model.*; import org.scribble.extensions.RegistryInfo; @@ -114,7 +114,7 @@ bpelModel.getBPELProcess().setTargetNamespace(contract.getNamespace()); // Add other namespaces - for (org.scribble.contract.model.Namespace ns : contract.getNamespaces()) { + for (org.jboss.savara.contract.model.Namespace ns : contract.getNamespaces()) { bpelModel.getBPELProcess().initNamespace(ns.getURI(), ns.getPrefix()); } } Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-06 20:09:53 UTC (rev 296) @@ -25,8 +25,8 @@ import org.jboss.savara.tools.wsdl.generator.WSDLGeneratorUtil; import org.scribble.model.*; import org.scribble.model.change.*; -import org.scribble.contract.model.Contract; -import org.scribble.contract.model.Interface; +import org.jboss.savara.contract.model.Contract; +import org.jboss.savara.contract.model.Interface; import org.scribble.conversation.model.*; import org.scribble.extensions.RegistryInfo; Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-07-06 20:09:53 UTC (rev 296) @@ -25,8 +25,8 @@ import org.jboss.savara.tools.wsdl.generator.WSDLGeneratorUtil; import org.scribble.model.*; import org.scribble.model.change.*; -import org.scribble.contract.model.Contract; -import org.scribble.contract.model.Interface; +import org.jboss.savara.contract.model.Contract; +import org.jboss.savara.contract.model.Interface; import org.scribble.extensions.RegistryInfo; /** Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java 2010-07-06 20:09:53 UTC (rev 296) @@ -19,7 +19,7 @@ import org.scribble.model.*; import org.scribble.model.change.*; -import org.scribble.contract.model.Contract; +import org.jboss.savara.contract.model.Contract; import org.scribble.conversation.model.*; /** Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java 2010-07-06 20:09:53 UTC (rev 296) @@ -21,7 +21,7 @@ import org.scribble.model.*; import org.scribble.model.change.DefaultModelChangeContext; import org.scribble.model.change.ModelChangeContext; -import org.scribble.contract.model.*; +import org.jboss.savara.contract.model.*; import junit.framework.TestCase; Modified: trunk/tools/eclipse/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF 2010-07-06 20:09:53 UTC (rev 296) @@ -7,7 +7,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: www.jboss.org Require-Bundle: javax.wsdl;visibility:=reexport, - org.scribble.contract.model, + org.jboss.savara.contract.model, org.apache.commons.logging, org.scribble.core, org.eclipse.core.resources, Modified: trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java 2010-07-06 20:09:53 UTC (rev 296) @@ -33,9 +33,9 @@ import org.jboss.savara.tools.wsdl.generator.WSDLGeneratorUtil; import org.jboss.savara.tools.wsdl.generator.soap.*; -import org.scribble.contract.model.Contract; -import org.scribble.contract.model.Interface; -import org.scribble.contract.model.Namespace; +import org.jboss.savara.contract.model.Contract; +import org.jboss.savara.contract.model.Interface; +import org.jboss.savara.contract.model.Namespace; import org.scribble.conversation.model.ConversationModel; import org.scribble.eclipse.util.*; import org.scribble.extensions.RegistryFactory; Modified: trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java 2010-07-06 20:09:53 UTC (rev 296) @@ -54,7 +54,7 @@ * @param operation The operation */ public void updateOperation(javax.wsdl.Definition defn, - org.scribble.contract.model.MessageExchangePattern mep, + org.jboss.savara.contract.model.MessageExchangePattern mep, javax.wsdl.BindingOperation operation); /** Modified: trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-07-06 20:09:53 UTC (rev 296) @@ -22,9 +22,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.scribble.contract.model.FaultDetails; -import org.scribble.contract.model.Namespace; -import org.scribble.contract.model.RequestResponseMEP; +import org.jboss.savara.contract.model.FaultDetails; +import org.jboss.savara.contract.model.Namespace; +import org.jboss.savara.contract.model.RequestResponseMEP; import org.scribble.model.TypeReference; /** @@ -47,7 +47,7 @@ * @param wsdlBinding The WSDL binding to use, or null if no binding * @return The WSDL definition */ - public java.util.List<javax.wsdl.Definition> generateDefinitions(org.scribble.contract.model.Contract contract, + public java.util.List<javax.wsdl.Definition> generateDefinitions(org.jboss.savara.contract.model.Contract contract, WSDLBinding wsdlBinding) { java.util.List<javax.wsdl.Definition> ret=new java.util.Vector<javax.wsdl.Definition>(); @@ -107,7 +107,7 @@ * @return The WSDL definition for the target namespace, or null if unable to find or create */ protected javax.wsdl.Definition getDefinition(java.util.List<javax.wsdl.Definition> wsdls, - org.scribble.contract.model.Contract contract, String targetNamespace, + org.jboss.savara.contract.model.Contract contract, String targetNamespace, WSDLBinding wsdlBinding) { javax.wsdl.Definition ret=null; @@ -147,7 +147,7 @@ * @param targetNamespace The target namespace * @return The WSDL definition */ - protected javax.wsdl.Definition createDefinition(org.scribble.contract.model.Contract contract, + protected javax.wsdl.Definition createDefinition(org.jboss.savara.contract.model.Contract contract, String targetNamespace) { javax.wsdl.Definition ret=null; @@ -187,8 +187,8 @@ * @return The WSDL port type */ public javax.wsdl.PortType createPortType(java.util.List<javax.wsdl.Definition> wsdls, - org.scribble.contract.model.Contract contract, - org.scribble.contract.model.Interface intf, + org.jboss.savara.contract.model.Contract contract, + org.jboss.savara.contract.model.Interface intf, WSDLBinding wsdlBinding) { javax.wsdl.PortType ret=null; @@ -229,8 +229,8 @@ * @return The WSDL port type binding */ public javax.wsdl.Binding createBinding(java.util.List<javax.wsdl.Definition> wsdls, - org.scribble.contract.model.Contract contract, - org.scribble.contract.model.Interface intf, + org.jboss.savara.contract.model.Contract contract, + org.jboss.savara.contract.model.Interface intf, javax.wsdl.PortType portType, WSDLBinding wsdlBinding) { javax.wsdl.Binding ret=null; @@ -280,8 +280,8 @@ * @return The WSDL operation */ public javax.wsdl.Operation createOperation(java.util.List<javax.wsdl.Definition> wsdls, - org.scribble.contract.model.Contract contract, javax.wsdl.PortType portType, - org.scribble.contract.model.MessageExchangePattern mep, + org.jboss.savara.contract.model.Contract contract, javax.wsdl.PortType portType, + org.jboss.savara.contract.model.MessageExchangePattern mep, WSDLBinding wsdlBinding) { javax.wsdl.Operation ret=null; @@ -362,8 +362,8 @@ * @return The WSDL binding operation */ public javax.wsdl.BindingOperation createBindingOperation(java.util.List<javax.wsdl.Definition> wsdls, - org.scribble.contract.model.Contract contract, javax.wsdl.Binding binding, - org.scribble.contract.model.MessageExchangePattern mep, + org.jboss.savara.contract.model.Contract contract, javax.wsdl.Binding binding, + org.jboss.savara.contract.model.MessageExchangePattern mep, WSDLBinding wsdlBinding) { javax.wsdl.BindingOperation ret=null; @@ -470,7 +470,7 @@ * @return The WSDL message */ public javax.wsdl.Message getMessage(java.util.List<javax.wsdl.Definition> wsdls, - org.scribble.contract.model.Contract contract, + org.jboss.savara.contract.model.Contract contract, javax.xml.namespace.QName msgname, java.util.List<TypeReference> types, WSDLBinding wsdlBinding) { Modified: trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPDocLitWSDLBinding.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPDocLitWSDLBinding.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPDocLitWSDLBinding.java 2010-07-06 20:09:53 UTC (rev 296) @@ -74,7 +74,7 @@ * @param operation The operation */ public void updateOperation(javax.wsdl.Definition defn, - org.scribble.contract.model.MessageExchangePattern mep, + org.jboss.savara.contract.model.MessageExchangePattern mep, javax.wsdl.BindingOperation operation) { try { javax.wsdl.extensions.soap.SOAPOperation soap=(javax.wsdl.extensions.soap.SOAPOperation) Modified: trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPRPCWSDLBinding.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPRPCWSDLBinding.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPRPCWSDLBinding.java 2010-07-06 20:09:53 UTC (rev 296) @@ -74,7 +74,7 @@ * @param operation The operation */ public void updateOperation(javax.wsdl.Definition defn, - org.scribble.contract.model.MessageExchangePattern mep, + org.jboss.savara.contract.model.MessageExchangePattern mep, javax.wsdl.BindingOperation operation) { try { javax.wsdl.extensions.soap.SOAPOperation soap=(javax.wsdl.extensions.soap.SOAPOperation) Modified: trunk/tools/eclipse/org.jboss.savara.tools.wsdl.tests/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.wsdl.tests/META-INF/MANIFEST.MF 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.wsdl.tests/META-INF/MANIFEST.MF 2010-07-06 20:09:53 UTC (rev 296) @@ -7,7 +7,7 @@ Bundle-Vendor: www.jboss.org Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.osgi.framework;version="1.3.0" -Require-Bundle: org.scribble.contract.model;bundle-version="0.1.0", +Require-Bundle: org.jboss.savara.contract.model, org.jboss.savara.tools.wsdl;bundle-version="1.0.0", org.junit, - org.scribble.core;bundle-version="0.1.0" + org.scribble.core Modified: trunk/tools/eclipse/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java =================================================================== --- trunk/tools/eclipse/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java 2010-07-06 20:09:53 UTC (rev 296) @@ -21,7 +21,7 @@ import javax.xml.namespace.QName; import org.jboss.savara.tools.wsdl.generator.WSDLGenerator; -import org.scribble.contract.model.*; +import org.jboss.savara.contract.model.*; import org.scribble.model.TypeReference; import junit.framework.TestCase; Modified: trunk/tools/eclipse/org.scribble.feature/feature.xml =================================================================== --- trunk/tools/eclipse/org.scribble.feature/feature.xml 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.scribble.feature/feature.xml 2010-07-06 20:09:53 UTC (rev 296) @@ -61,13 +61,6 @@ unpack="false"/> <plugin - id="org.scribble.contract.model" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.scribble.conversation.comparator" download-size="0" install-size="0" Modified: trunk/tools/eclipse/org.scribble.pi4soa.cdm/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/eclipse/org.scribble.pi4soa.cdm/META-INF/MANIFEST.MF 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.scribble.pi4soa.cdm/META-INF/MANIFEST.MF 2010-07-06 20:09:53 UTC (rev 296) @@ -19,7 +19,7 @@ org.eclipse.ui.views.properties.tabbed;resolution:=optional, org.scribble.expression.xpath, org.scribble.eclipse;resolution:=optional, - org.scribble.contract.model + org.jboss.savara.contract.model Scribble-Extensions: org.scribble.pi4soa.cdm.parser.CDMTokenizer, org.scribble.pi4soa.cdm.parser.CDMModelParserRule, org.scribble.pi4soa.cdm.model.CDMNotation, Modified: trunk/tools/eclipse/org.scribble.pi4soa.cdm/src/java/org/scribble/pi4soa/cdm/parser/rules/ConversationConverterRuleImpl.java =================================================================== --- trunk/tools/eclipse/org.scribble.pi4soa.cdm/src/java/org/scribble/pi4soa/cdm/parser/rules/ConversationConverterRuleImpl.java 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/org.scribble.pi4soa.cdm/src/java/org/scribble/pi4soa/cdm/parser/rules/ConversationConverterRuleImpl.java 2010-07-06 20:09:53 UTC (rev 296) @@ -33,7 +33,7 @@ import org.pi4soa.common.xml.XMLUtils; import org.scribble.model.*; import org.scribble.model.admin.DependencyType; -import org.scribble.contract.model.*; +import org.jboss.savara.contract.model.*; import org.scribble.conversation.model.*; import org.scribble.expression.xpath.model.*; @@ -320,9 +320,9 @@ for (int i=0; i < pinst.getRoleTypes().size(); i++) { Contract contract=null; - if (role.getAnnotations().containsKey(org.scribble.contract.model.Contract.class.getName())) { + if (role.getAnnotations().containsKey(Contract.class.getName())) { contract = (Contract)role.getAnnotations().get( - org.scribble.contract.model.Contract.class.getName()); + Contract.class.getName()); } else { contract = new Contract(); @@ -333,8 +333,8 @@ java.util.List<NameSpace> nspaces=pinst.getPackage().getTypeDefinitions().getNameSpaces(); for (int j=0; j < nspaces.size(); j++) { - org.scribble.contract.model.Namespace ns= - new org.scribble.contract.model.Namespace(); + org.jboss.savara.contract.model.Namespace ns= + new org.jboss.savara.contract.model.Namespace(); ns.setPrefix(nspaces.get(j).getPrefix()); ns.setURI(nspaces.get(j).getURI()); @@ -343,7 +343,7 @@ contract.getNamespaces().add(ns); } - role.getAnnotations().put(org.scribble.contract.model.Contract.class.getName(), + role.getAnnotations().put(Contract.class.getName(), contract); } @@ -384,9 +384,9 @@ for (int i=0; i < ptype.getRoleTypes().size(); i++) { Contract contract=null; - if (role.getAnnotations().containsKey(org.scribble.contract.model.Contract.class.getName())) { + if (role.getAnnotations().containsKey(Contract.class.getName())) { contract = (Contract)role.getAnnotations().get( - org.scribble.contract.model.Contract.class.getName()); + Contract.class.getName()); } else { contract = new Contract(); @@ -397,8 +397,8 @@ java.util.List<NameSpace> nspaces=ptype.getPackage().getTypeDefinitions().getNameSpaces(); for (int j=0; j < nspaces.size(); j++) { - org.scribble.contract.model.Namespace ns= - new org.scribble.contract.model.Namespace(); + org.jboss.savara.contract.model.Namespace ns= + new org.jboss.savara.contract.model.Namespace(); ns.setPrefix(nspaces.get(j).getPrefix()); ns.setURI(nspaces.get(j).getURI()); @@ -407,7 +407,7 @@ contract.getNamespaces().add(ns); } - role.getAnnotations().put(org.scribble.contract.model.Contract.class.getName(), + role.getAnnotations().put(Contract.class.getName(), contract); } @@ -657,9 +657,9 @@ private static final long serialVersionUID = 4068744630125720449L; - private org.scribble.contract.model.Contract m_contract=null; - private org.scribble.contract.model.Interface m_currentInterface=null; - private org.scribble.contract.model.MessageExchangePattern m_currentMEP=null; + private org.jboss.savara.contract.model.Contract m_contract=null; + private org.jboss.savara.contract.model.Interface m_currentInterface=null; + private org.jboss.savara.contract.model.MessageExchangePattern m_currentMEP=null; public InterfaceVisitorImpl(Contract contract) { m_contract = contract; @@ -674,7 +674,7 @@ } public void interfaceStart(InterfaceDefinition defn) { - m_currentInterface = new org.scribble.contract.model.Interface(); + m_currentInterface = new org.jboss.savara.contract.model.Interface(); m_currentInterface.setNamespace(defn.getNamespace()); Deleted: trunk/tools/eclipse/releng/build.properties =================================================================== --- trunk/tools/eclipse/releng/build.properties 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/releng/build.properties 2010-07-06 20:09:53 UTC (rev 296) @@ -1,54 +0,0 @@ -## BEGIN PROJECT BUILD PROPERTIES ## - -# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you -thirdPartyDownloadLicenseAcceptance="I accept" - -projectid=savara.tools -zipPrefix=savara -incubation= -buildType=N -version=1.0.0 - -#mainFeatureToBuildID=org.pi4soa.sdk.feature -#testFeatureToBuildID=org.pi4soa.tests.feature -mainFeatureToBuildID=org.jboss.savara.tools.feature -testFeatureToBuildID=org.scribble.feature - -#build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup -build.steps=buildUpdate,generateDigests,publish,cleanup - -JAVA14_HOME=${JAVA_HOME} -JAVA50_HOME=${JAVA_HOME} -JAVA60_HOME=${JAVA_HOME} - -# depends on Eclipse, EMF, XSD, GEF, Orbit (Xalan, Xerces, resolver, serializer), and Eclipse base -repositoryURLs=\ -http://download.eclipse.org/releases/galileo/,\ -http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite,\ -http://download.jboss.org/jbosstools/builds/nightly/trunk/201006290654/all/JBossTools-Update-3.2.0.v201006290654N-H394-M1.zip - -IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+\ -org.eclipse.emf.feature.group+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\ -org.apache.xml.resolver+javax.xml+org.apache.xml.serializer+org.apache.xerces+org.apache.xalan+\ -org.pi4soa.common+org.pi4soa.cdl+org.pi4soa.service+org.pi4soa.designer+javax.wsdl+org.eclipse.stp.bpmn+\ -org.eclipse.gmf.runtime.notation+org.eclipse.wst.common.project.facet.core+org.eclipse.jst.common.frameworks+\ -org.eclipse.wst.common.frameworks - -flattenDependencies=true -parallelCompilation=true -generateFeatureVersionSuffix=true -individualSourceBundles=true - -# do not sign or pack jars -#skipPack=true -skipSign=true - -# generate a SNAPSHOT-named build for easier reuse in other builds -buildAlias=${buildType}-SNAPSHOT -forceContextQualifier=v${buildTimestamp} - -domainNamespace=* -projNamespace=org.jboss.savara.tools -projRelengName=org.jboss.savara.tools.releng - -## END PROJECT BUILD PROPERTIES ## Deleted: trunk/tools/eclipse/releng/build.properties.example.hudson.qa.jboss.com =================================================================== --- trunk/tools/eclipse/releng/build.properties.example.hudson.qa.jboss.com 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/releng/build.properties.example.hudson.qa.jboss.com 2010-07-06 20:09:53 UTC (rev 296) @@ -1,53 +0,0 @@ -## BEGIN PROJECT BUILD PROPERTIES ## - -# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you -thirdPartyDownloadLicenseAcceptance="I accept" - -projectid=savara.tools -zipPrefix=savara -incubation= -buildType=N -version=1.0.0 - -mainFeatureToBuildID=org.jboss.savara.tools.feature -testFeatureToBuildID=org.scribble.feature - -#build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup -build.steps=buildUpdate,generateDigests,publish,cleanup - -JAVA14_HOME=${JAVA_HOME} -JAVA50_HOME=${JAVA_HOME} -JAVA60_HOME=${JAVA_HOME} - -# depends on Eclipse, EMF, XSD, GEF, Orbit (Xalan, Xerces, resolver, serializer), and Eclipse base -repositoryURLs=\ -http://download.eclipse.org/releases/galileo/,\ -http://repository.jboss.com/eclipse/galileo/repos/orbit-R20090825191606-updateSite.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip\ -http://download.jboss.org/jbosstools/builds/nightly/trunk/201006210931/all/JBossTools-Update-3.2.0.v201006210931N-H358-M1.zip - -IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+\ -org.eclipse.emf.feature.group+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\ -org.apache.xml.resolver+javax.xml+org.apache.xml.serializer+org.apache.xerces+org.apache.xalan+\ -org.pi4soa.common+org.pi4soa.cdl+org.pi4soa.designer - -flattenDependencies=true -parallelCompilation=true -generateFeatureVersionSuffix=true -individualSourceBundles=true - -# do not sign or pack jars -#skipPack=true -skipSign=true - -# generate a SNAPSHOT-named build for easier reuse in other builds -buildAlias=${buildType}-SNAPSHOT -forceContextQualifier=v${buildTimestamp} - -domainNamespace=* -projNamespace=org.jboss.savara.tools -projRelengName=org.jboss.savara.tools.releng - -## END PROJECT BUILD PROPERTIES ## Deleted: trunk/tools/eclipse/releng/build.properties.example.linux =================================================================== --- trunk/tools/eclipse/releng/build.properties.example.linux 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/releng/build.properties.example.linux 2010-07-06 20:09:53 UTC (rev 296) @@ -1,60 +0,0 @@ -## BEGIN PROJECT BUILD PROPERTIES ## - -# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you -thirdPartyDownloadLicenseAcceptance="I accept" - -projectid=savara.tools -zipPrefix=savara -incubation= -buildType=N -version=1.0.0 - -mainFeatureToBuildID=org.jboss.savara.tools.feature -testFeatureToBuildID=org.scribble.feature - -#build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup -build.steps=buildUpdate,generateDigests,publish,cleanup - -# Re-use local sources? -localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/pi4soa -relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/pi4soa/releng -relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder -relengCommonBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.dash.common.releng - -JAVA_HOME=/usr/lib/jvm/java -JAVA14_HOME=/usr/lib/jvm/java -JAVA50_HOME=/usr/lib/jvm/java -JAVA60_HOME=/usr/lib/jvm/java - -# depends on Eclipse, EMF, XSD, GEF, Orbit (Xalan, Xerces, resolver, serializer), and Eclipse base -repositoryURLs=\ -http://download.eclipse.org/releases/galileo/,\ -http://repository.jboss.com/eclipse/galileo/repos/orbit-R20090825191606-updateSite.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip\ -http://download.jboss.org/jbosstools/builds/nightly/trunk/201006210931/all/JBossTools-Update-3.2.0.v201006210931N-H358-M1.zip - -IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+\ -org.eclipse.emf.feature.group+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\ -org.apache.xml.resolver+javax.xml+org.apache.xml.serializer+org.apache.xerces+org.apache.xalan+\ -org.pi4soa.common+org.pi4soa.cdl+org.pi4soa.designer - -flattenDependencies=true -parallelCompilation=true -generateFeatureVersionSuffix=true -individualSourceBundles=true - -# do not sign or pack jars -#skipPack=true -skipSign=true - -# generate a SNAPSHOT-named build for easier reuse in other builds -buildAlias=${buildType}-SNAPSHOT -forceContextQualifier=v${buildTimestamp} - -domainNamespace=* -projNamespace=org.jboss.savara.tools -projRelengName=org.jboss.savara.tools.releng - -## END PROJECT BUILD PROPERTIES ## Deleted: trunk/tools/eclipse/releng/build.properties.example.windows =================================================================== --- trunk/tools/eclipse/releng/build.properties.example.windows 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/releng/build.properties.example.windows 2010-07-06 20:09:53 UTC (rev 296) @@ -1,64 +0,0 @@ -## BEGIN PROJECT BUILD PROPERTIES ## - -# this property allows ant-contrib and pde-svn-plugin to be fetched and installed automatically for you -thirdPartyDownloadLicenseAcceptance="I accept" - -projectid=savara.tools -zipPrefix=savara -incubation= -buildType=N -version=1.0.0 - -mainFeatureToBuildID=org.jboss.savara.tools.feature -testFeatureToBuildID=org.scribble.feature - -#build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup -build.steps=buildUpdate,generateDigests,publish,cleanup - -# Re-use local sources? -localSourceCheckoutDir=C:/workspace2 - -# For windows, must be explicit about paths using correct slashes (/); dirs with spaces should be avoided -writableBuildRoot=C:/tmp/build -relengBuilderDir=C:/workspace2/org.pi4soa.releng -relengBaseBuilderDir=C:/workspace2/org.eclipse.releng.basebuilder -relengCommonBuilderDir=C:/workspace2/org.eclipse.dash.common.releng - -JAVA_HOME=C:/Progra~1/Java/jdk1.6.0_11 -JAVA14_HOME=C:/Progra~1/Java/jdk1.6.0_11 -JAVA50_HOME=C:/Progra~1/Java/jdk1.6.0_11 -JAVA60_HOME=C:/Progra~1/Java/jdk1.6.0_11 - -# depends on Eclipse, EMF, XSD, GEF, Orbit (Xalan, Xerces, resolver, serializer), and Eclipse base -repositoryURLs=\ -http://download.eclipse.org/releases/galileo/,\ -http://repository.jboss.com/eclipse/galileo/repos/orbit-R20090825191606-updateSite.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\ -http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip\ -http://download.jboss.org/jbosstools/builds/nightly/trunk/201006210931/all/JBossTools-Update-3.2.0.v201006210931N-H358-M1.zip - -IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+\ -org.eclipse.emf.feature.group+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\ -org.apache.xml.resolver+javax.xml+org.apache.xml.serializer+org.apache.xerces+org.apache.xalan+\ -org.pi4soa.common+org.pi4soa.cdl+org.pi4soa.designer - -flattenDependencies=true -parallelCompilation=true -generateFeatureVersionSuffix=true -individualSourceBundles=true - -# do not sign or pack jars -#packing does not work on windows -skipPack=true -skipSign=true - -# generate a SNAPSHOT-named build for easier reuse in other builds -buildAlias=${buildType}-SNAPSHOT -forceContextQualifier=v${buildTimestamp} - -domainNamespace=* -projNamespace=org.jboss.savara.tools -projRelengName=org.jboss.savara.tools.releng - -## END PROJECT BUILD PROPERTIES ## Deleted: trunk/tools/eclipse/releng/build.xml =================================================================== --- trunk/tools/eclipse/releng/build.xml 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/releng/build.xml 2010-07-06 20:09:53 UTC (rev 296) @@ -1,44 +0,0 @@ -<project default="run" name="org.jboss.tools.*.releng/build.xml - Run a JBoss Tools component build using the Athena CBI"> - <target name="run"> - <!-- - You must check out the following projects to your workspace: - - org.eclipse.releng.basebuilder - org.eclipse.dash.common.releng - jbosstools/trunk/<your component>/releng - --> - - <!-- load properties and set timestamp for the build --> - <property file="build.properties" /> - <tstamp> - <format property="buildTimestamp" pattern="yyyyMMddHHmm" /> - </tstamp> - - <!-- calculate workspaceDir as parent of this folder, the project's .releng folder (relengBuilderDir) --> - <property name="relengBuilderDir" value="${basedir}" /> - <dirname file="${relengBuilderDir}" property="workspaceDir" /> - - <!-- - can build in /tmp, eg., in /tmp/build, or in workspace, eg., - ${WORKSPACE}/build - --> - <property name="writableBuildRoot" value="/tmp/build" /> - - <!-- - can be simple path, eg., - ${writableBuildRoot}/${buildType}${buildTimestamp}-${zipPrefix} or longer, eg., - ${writableBuildRoot}/${topprojectName}/${projectName}/downloads/drops/${version}/${buildType}${buildTimestamp} or - ${writableBuildRoot}/${topprojectName}/${projectName}/${subprojectName}/downloads/drops/${version}/${buildType}${buildTimestamp} - - Or, to generate a SNAPSHOT-named build for easier reuse in other builds, set - buildAlias=${buildType}-SNAPSHOT, and - buildDir=${writableBuildRoot}/${buildType}-SNAPSHOT-${zipPrefix} - --> - <property name="buildDir" value="${writableBuildRoot}/${buildType}${buildTimestamp}-${zipPrefix}" /> - - <!-- invoke a new Eclipse process and launch the build from the common.releng folder --> - <property name="relengCommonBuilderDir" value="${workspaceDir}/org.eclipse.dash.common.releng" /> - <ant antfile="${relengCommonBuilderDir}/buildAll.xml" target="runEclipse" dir="${relengCommonBuilderDir}" /> - - </target> -</project> Deleted: trunk/tools/eclipse/releng/jbosstools-trunk pi4soa releng build.xml.launch =================================================================== --- trunk/tools/eclipse/releng/jbosstools-trunk pi4soa releng build.xml.launch 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/releng/jbosstools-trunk pi4soa releng build.xml.launch 2010-07-06 20:09:53 UTC (rev 296) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> -<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/> -<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${container}"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/pi4soa/releng/build.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/pi4soa/releng}/buildlog.latest.txt"/> -<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> -<listEntry value="org.eclipse.ui.externaltools.launchGroup"/> -</listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jbosstools-trunk"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="java-1.6.0-openjdk-1.6.0.0"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/pi4soa/releng/build.xml}"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -</launchConfiguration> Deleted: trunk/tools/eclipse/releng/testing.properties =================================================================== --- trunk/tools/eclipse/releng/testing.properties 2010-07-03 19:09:30 UTC (rev 295) +++ trunk/tools/eclipse/releng/testing.properties 2010-07-06 20:09:53 UTC (rev 296) @@ -1,10 +0,0 @@ -#extraVMargs="-Dfoo=bar" - -#csv list of test plugins to run -testPluginsToRun=org.scribble.core - -# TODO add test suite(s) -# define which suite to run within each test plugin; or, include a test.xml script in -# the test plugin to deviate from default one-suite-per-plugin operation -#org.pi4soa.common.tests.suite=org.pi4soa.common.CommonAllTests -org.scribble.core.suite=org.scribble.ScribbleCoreAllTests