Author: objectiser Date: 2011-01-07 11:32:56 -0500 (Fri, 07 Jan 2011) New Revision: 542 Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.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/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF branches/experimental/2.0.x/tools/site/pom.xml branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml Log: Refactored contract bundle. Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542) @@ -11,7 +11,7 @@ Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: org.pi4soa.cdl, org.pi4soa.common, - org.savara.contract.model, + org.savara.contract, org.scribble.common, org.scribble.protocol, org.junit, Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-07 16:32:56 UTC (rev 542) @@ -41,7 +41,7 @@ </dependency> <dependency> <groupId>org.savara.bundles</groupId> - <artifactId>org.savara.contract.model</artifactId> + <artifactId>org.savara.contract</artifactId> <version>${savara.version}</version> </dependency> <dependency> Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath 2011-01-07 16:32:56 UTC (rev 542) @@ -6,7 +6,7 @@ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> - <classpathentry kind="src" path="/org.savara.contract.model"/> + <classpathentry kind="src" path="/org.savara.contract"/> <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/> Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542) @@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: javax.wsdl;visibility:=reexport, - org.savara.contract.model, + org.savara.contract, org.apache.commons.logging, org.scribble.common, org.scribble.protocol, Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml 2011-01-07 16:32:56 UTC (rev 542) @@ -26,7 +26,7 @@ </dependency> <dependency> <groupId>org.savara.bundles</groupId> - <artifactId>org.savara.contract.model</artifactId> + <artifactId>org.savara.contract</artifactId> <version>${savara.version}</version> </dependency> <dependency> 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-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-07 16:32:56 UTC (rev 542) @@ -21,7 +21,7 @@ </dependency> <dependency> <groupId>org.savara.bundles</groupId> - <artifactId>org.savara.contract.model</artifactId> + <artifactId>org.savara.contract</artifactId> <version>${savara.version}</version> </dependency> <dependency> 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-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-07 16:32:56 UTC (rev 542) @@ -180,7 +180,7 @@ </requires> <plugin - id="org.savara.contract.model" + id="org.savara.contract" download-size="0" install-size="0" version="0.0.0" 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-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-07 16:32:56 UTC (rev 542) @@ -21,7 +21,7 @@ </dependency> <dependency> <groupId>org.savara.bundles</groupId> - <artifactId>org.savara.contract.model</artifactId> + <artifactId>org.savara.contract</artifactId> <version>${savara.version}</version> </dependency> <dependency> Modified: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542) @@ -10,6 +10,6 @@ Require-Bundle: org.scribble.common, org.scribble.protocol, org.savara.core, - org.savara.contract.model + org.savara.contract Export-Package: org.savara.protocol.contract, org.savara.protocol.contract.impl;x-friends:="org.savara.protocol.contract.tests" Modified: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml 2011-01-07 16:32:56 UTC (rev 542) @@ -26,7 +26,7 @@ </dependency> <dependency> <groupId>org.savara.bundles</groupId> - <artifactId>org.savara.contract.model</artifactId> + <artifactId>org.savara.contract</artifactId> <version>${savara.version}</version> </dependency> </dependencies> Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542) @@ -14,7 +14,7 @@ org.scribble.protocol.parser, org.apache.commons.logging, org.savara.pi4soa.cdm;resolution:=optional, - org.savara.contract.model, + org.savara.contract, org.savara.tools.wsdl, org.eclipse.ui.ide, org.eclipse.jst.common.frameworks, 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-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml 2011-01-07 16:32:56 UTC (rev 542) @@ -26,7 +26,7 @@ </dependency> <dependency> <groupId>org.savara.bundles</groupId> - <artifactId>org.savara.contract.model</artifactId> + <artifactId>org.savara.contract</artifactId> <version>${savara.version}</version> </dependency> <dependency> Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542) @@ -7,7 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: www.savara.org Require-Bundle: javax.wsdl;visibility:=reexport, - org.savara.contract.model, + org.savara.contract, org.apache.commons.logging, org.scribble.common, org.eclipse.core.resources, Modified: branches/experimental/2.0.x/tools/site/pom.xml =================================================================== --- branches/experimental/2.0.x/tools/site/pom.xml 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/tools/site/pom.xml 2011-01-07 16:32:56 UTC (rev 542) @@ -31,7 +31,7 @@ </dependency> <dependency> <groupId>org.savara.bundles</groupId> - <artifactId>org.savara.contract.model</artifactId> + <artifactId>org.savara.contract</artifactId> <version>${savara.version}</version> </dependency> <dependency> Modified: branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542) @@ -9,7 +9,7 @@ Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: org.scribble.common, org.scribble.protocol, - org.savara.contract.model, + org.savara.contract, org.savara.protocol.contract, org.junit4 Export-Package: org.savara.protocol.contract Modified: branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml =================================================================== --- branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml 2011-01-07 16:03:26 UTC (rev 541) +++ branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml 2011-01-07 16:32:56 UTC (rev 542) @@ -26,7 +26,7 @@ </dependency> <dependency> <groupId>org.savara.bundles</groupId> - <artifactId>org.savara.contract.model</artifactId> + <artifactId>org.savara.contract</artifactId> <version>${savara.version}</version> </dependency> </dependencies>