Author: objectiser Date: 2011-01-05 18:01:21 -0500 (Wed, 05 Jan 2011) New Revision: 538 Modified: branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/feature.xml branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/feature.xml branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/pom.xml branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/pom.xml branches/experimental/2.0.x/tools/plugins/pom.xml branches/experimental/2.0.x/tools/site/pom.xml Log: Started sorting Eclipse tools build, but still failing - more work to do. Modified: branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/feature.xml =================================================================== --- branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/feature.xml 2011-01-05 22:13:01 UTC (rev 537) +++ branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/feature.xml 2011-01-05 23:01:21 UTC (rev 538) @@ -2,7 +2,7 @@ <feature id="org.jboss.savara.tools.feature" label="JBoss SAVARA Tools Feature" - version="1.2.0.qualifier" + version="2.0.0.qualifier" provider-name="www.jboss.org"> <description> Modified: branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml =================================================================== --- branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-05 22:13:01 UTC (rev 537) +++ branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-05 23:01:21 UTC (rev 538) @@ -41,25 +41,10 @@ </dependency> <dependency> <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.comparator</artifactId> + <artifactId>org.scribble.protocol.projection</artifactId> <version>${scribble.version}</version> </dependency> <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.projector</artifactId> - <version>${scribble.version}</version> - </dependency> - <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.export.text</artifactId> - <version>${scribble.version}</version> - </dependency> - <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.validation</artifactId> - <version>${scribble.version}</version> - </dependency> - <dependency> <groupId>org.savara.tools</groupId> <artifactId>org.savara.tools.bpel</artifactId> <version>${savara.version}</version> Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml =================================================================== --- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-05 22:13:01 UTC (rev 537) +++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-05 23:01:21 UTC (rev 538) @@ -2,7 +2,7 @@ <feature id="org.savara.tools.feature" label="SAVARA Tools Feature" - version="1.2.0.qualifier" + version="2.0.0.qualifier" provider-name="www.savara.org"> <description> Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml =================================================================== --- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-05 22:13:01 UTC (rev 537) +++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-05 23:01:21 UTC (rev 538) @@ -36,30 +36,10 @@ </dependency> <dependency> <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.conformance</artifactId> + <artifactId>org.scribble.protocol.projection</artifactId> <version>${scribble.version}</version> </dependency> <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.comparator</artifactId> - <version>${scribble.version}</version> - </dependency> - <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.projector</artifactId> - <version>${scribble.version}</version> - </dependency> - <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.export.text</artifactId> - <version>${scribble.version}</version> - </dependency> - <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.validation</artifactId> - <version>${scribble.version}</version> - </dependency> - <dependency> <groupId>org.savara.tools</groupId> <artifactId>org.savara.tools.bpel</artifactId> <version>${savara.version}</version> Modified: branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/feature.xml =================================================================== --- branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/feature.xml 2011-01-05 22:13:01 UTC (rev 537) +++ branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/feature.xml 2011-01-05 23:01:21 UTC (rev 538) @@ -2,7 +2,7 @@ <feature id="org.scribble.protocol.feature" label="Scribble Protocol Feature" - version="1.2.0.qualifier" + version="2.0.0.qualifier" provider-name="www.jboss.org"> <description> @@ -10,17 +10,17 @@ </description> <copyright> - * + * * Copyright 2010 www.scribble.org * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2.0 (the &quot;License&quot;); * 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, + * distributed under the License is distributed on an &quot;AS IS&quot; 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. @@ -28,7 +28,7 @@ </copyright> <license url="http://www.apache.org/licenses/LICENSE-2.0"> - Apache License + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -36,38 +36,38 @@ 1. Definitions. - "License" shall mean the terms and conditions for use, reproduction, + &quot;License&quot; 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 + &quot;Licensor&quot; 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 + &quot;Legal Entity&quot; 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 + &quot;control&quot; 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 + &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity exercising permissions granted by this License. - "Source" form shall mean the preferred form for making modifications, + &quot;Source&quot; 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 + &quot;Object&quot; 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 + &quot;Work&quot; 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 + &quot;Derivative Works&quot; 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 @@ -75,21 +75,21 @@ 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 + &quot;Contribution&quot; 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" + the copyright owner. For the purposes of this definition, &quot;submitted&quot; 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." + designated in writing by the copyright owner as &quot;Not a Contribution.&quot; - "Contributor" shall mean Licensor and any individual or Legal Entity + &quot;Contributor&quot; 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. @@ -133,7 +133,7 @@ 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 + (d) If the Work includes a &quot;NOTICE&quot; 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 @@ -172,7 +172,7 @@ 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, + Contributor provides its Contributions) on an &quot;AS IS&quot; 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 Modified: branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/pom.xml =================================================================== --- branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/pom.xml 2011-01-05 22:13:01 UTC (rev 537) +++ branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/pom.xml 2011-01-05 23:01:21 UTC (rev 538) @@ -31,19 +31,9 @@ </dependency> <dependency> <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.projector</artifactId> + <artifactId>org.scribble.protocol.projection</artifactId> <version>${scribble.version}</version> </dependency> - <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.validation</artifactId> - <version>${scribble.version}</version> - </dependency> - <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.export.text</artifactId> - <version>${scribble.version}</version> - </dependency> </dependencies> </project> Property changes on: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract ___________________________________________________________________ Name: svn:ignore + bin Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml 2011-01-05 22:13:01 UTC (rev 537) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml 2011-01-05 23:01:21 UTC (rev 538) @@ -39,6 +39,11 @@ <artifactId>org.savara.bpel</artifactId> <version>${savara.version}</version> </dependency> + <dependency> + <groupId>org.savara.tools</groupId> + <artifactId>org.savara.tools.core</artifactId> + <version>${savara.version}</version> + </dependency> </dependencies> </project> Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-05 22:13:01 UTC (rev 537) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-05 23:01:21 UTC (rev 538) @@ -39,6 +39,7 @@ import org.savara.contract.model.Interface; import org.savara.contract.model.Namespace; import org.savara.core.eclipse.ScribbleServices; +import org.savara.util.PropertyNames; import org.savara.util.XMLUtils; import org.savara.wsdl.generator.WSDLGeneratorFactory; import org.savara.wsdl.generator.soap.SOAPDocLitWSDLBinding; @@ -252,9 +253,13 @@ bpelFile.create(null, true, new org.eclipse.core.runtime.NullProgressMonitor()); + java.util.Map<String, String> prefixes= + (java.util.Map<String, String>) + localcm.getProperties().get(PropertyNames.NAMESPACE_PREFIXES); + //String bpelText=XMLUtils.toText(bpelProcess.getDOMElement()); ByteArrayOutputStream os=new ByteArrayOutputStream(); - BPELModelUtil.serialize(bpelProcess, os); + BPELModelUtil.serialize(bpelProcess, os, prefixes); os.close(); Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/pom.xml =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/pom.xml 2011-01-05 22:13:01 UTC (rev 537) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/pom.xml 2011-01-05 23:01:21 UTC (rev 538) @@ -19,6 +19,21 @@ <artifactId>org.scribble.common</artifactId> <version>${scribble.version}</version> </dependency> + <dependency> + <groupId>org.scribble.bundles</groupId> + <artifactId>org.scribble.protocol</artifactId> + <version>${scribble.version}</version> + </dependency> + <dependency> + <groupId>org.scribble.bundles</groupId> + <artifactId>org.scribble.protocol.parser</artifactId> + <version>${scribble.version}</version> + </dependency> + <dependency> + <groupId>org.scribble.bundles</groupId> + <artifactId>org.scribble.protocol.monitor</artifactId> + <version>${scribble.version}</version> + </dependency> </dependencies> </project> Modified: branches/experimental/2.0.x/tools/plugins/pom.xml =================================================================== --- branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-05 22:13:01 UTC (rev 537) +++ branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-05 23:01:21 UTC (rev 538) @@ -15,10 +15,12 @@ </parent> <modules> + <!-- <module>org.savara.protocol.contract</module> <module>org.savara.tap.eclipse</module> <module>org.savara.tap.model</module> <module>org.savara.tap.validation</module> + --> <module>org.savara.tools.bpel</module> <module>org.savara.tools.bpmn</module> <module>org.savara.tools.core</module> Modified: branches/experimental/2.0.x/tools/site/pom.xml =================================================================== --- branches/experimental/2.0.x/tools/site/pom.xml 2011-01-05 22:13:01 UTC (rev 537) +++ branches/experimental/2.0.x/tools/site/pom.xml 2011-01-05 23:01:21 UTC (rev 538) @@ -56,24 +56,9 @@ </dependency> <dependency> <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.projector</artifactId> + <artifactId>org.scribble.protocol.projection</artifactId> <version>${scribble.version}</version> </dependency> - <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.comparator</artifactId> - <version>${scribble.version}</version> - </dependency> - <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.validation</artifactId> - <version>${scribble.version}</version> - </dependency> - <dependency> - <groupId>org.scribble.bundles</groupId> - <artifactId>org.scribble.protocol.export.text</artifactId> - <version>1${scribble.version}</version> - </dependency> </dependencies> </project>