From 668696fac17058aeab5ca6fef79490ca5c8874a0 Mon Sep 17 00:00:00 2001 From: rsivaram Date: Thu, 3 Jul 2008 12:59:48 +0000 Subject: Fixes for itest/osgi-tuscany and Felix versions git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@673669 13f79535-47bb-0310-9956-ffa450edef68 --- .../itest/osgi-contribution/contribution-classes-v2/pom.xml | 2 +- .../sca/itest/osgi-contribution/contribution-classes/pom.xml | 2 +- java/sca/itest/osgi-contribution/contribution-test/pom.xml | 12 +++--------- .../src/test/resources/osgi/felix/felix.config.properties | 10 +++++----- java/sca/itest/osgi-implementation/pom.xml | 12 +++--------- .../src/test/resources/osgi/felix/felix.config.properties | 10 +++++----- java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml | 12 +++--------- .../src/test/resources/META-INF/MANIFEST.MF | 4 +--- .../src/test/resources/felix/felix.config.properties | 10 +++++----- java/sca/itest/osgi-tuscany/sca-api/pom.xml | 2 +- java/sca/itest/osgi-tuscany/test-bundles/pom.xml | 2 +- java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml | 2 +- java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml | 2 +- java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml | 2 -- .../tuscany/sca/installer/InstallerBundleActivator.java | 3 --- java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml | 2 +- java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml | 2 +- 17 files changed, 33 insertions(+), 58 deletions(-) (limited to 'java/sca/itest') diff --git a/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml b/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml index a14b919241..edbb66ab09 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml +++ b/java/sca/itest/osgi-contribution/contribution-classes-v2/pom.xml @@ -66,7 +66,7 @@ org.apache.felix org.osgi.core - 1.0.0 + 1.0.1 diff --git a/java/sca/itest/osgi-contribution/contribution-classes/pom.xml b/java/sca/itest/osgi-contribution/contribution-classes/pom.xml index 24fb424aef..0a95927b7f 100644 --- a/java/sca/itest/osgi-contribution/contribution-classes/pom.xml +++ b/java/sca/itest/osgi-contribution/contribution-classes/pom.xml @@ -66,7 +66,7 @@ org.apache.felix org.osgi.core - 1.0.0 + 1.0.1 diff --git a/java/sca/itest/osgi-contribution/contribution-test/pom.xml b/java/sca/itest/osgi-contribution/contribution-test/pom.xml index 7024b39f65..6853aba2d1 100644 --- a/java/sca/itest/osgi-contribution/contribution-test/pom.xml +++ b/java/sca/itest/osgi-contribution/contribution-test/pom.xml @@ -65,25 +65,19 @@ org.apache.felix org.apache.felix.main - 1.1.0-SNAPSHOT + 1.0.4 - - org.apache.felix - org.osgi.core - 1.0.0 - - org.apache.felix org.apache.felix.configadmin - 1.0.0 + 1.0.1 org.apache.felix org.apache.felix.scr - 1.0.0 + 1.0.2 diff --git a/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties index 154176f54e..ea8d272a0c 100644 --- a/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties +++ b/java/sca/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties @@ -27,12 +27,12 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \ felix.auto.start.1= \ - "file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar" \ - "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar" + "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" \ + "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar" -# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar" \ -# "file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar" \ -# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar" \ +# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \ +# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \ +# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \ felix.startlevel.framework=1 felix.startlevel.bundle=1 diff --git a/java/sca/itest/osgi-implementation/pom.xml b/java/sca/itest/osgi-implementation/pom.xml index 85b1becc7f..71d5240a21 100644 --- a/java/sca/itest/osgi-implementation/pom.xml +++ b/java/sca/itest/osgi-implementation/pom.xml @@ -33,19 +33,13 @@ org.apache.felix org.apache.felix.main - 1.1.0-SNAPSHOT + 1.0.4 - - org.apache.felix - org.osgi.core - 1.0.0 - - org.apache.felix org.apache.felix.configadmin - 1.0.0 + 1.0.1 @@ -58,7 +52,7 @@ org.apache.felix org.apache.felix.scr - 1.0.0 + 1.0.2 diff --git a/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties index 5aa83f15eb..8399991503 100644 --- a/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties +++ b/java/sca/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties @@ -27,13 +27,13 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \ felix.auto.start.1= \ - "file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar" \ - "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar" + "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" \ + "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar" -# "file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar" \ -# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar" \ -# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar" \ +# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \ +# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \ +# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \ felix.startlevel.framework=1 felix.startlevel.bundle=1 diff --git a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml index e873241640..fa1ace68ac 100644 --- a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml +++ b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/pom.xml @@ -42,19 +42,13 @@ org.apache.felix org.apache.felix.main - 1.1.0-SNAPSHOT + 1.0.4 - - org.apache.felix - org.osgi.core - 1.0.0 - - org.apache.felix org.apache.felix.configadmin - 1.0.0 + 1.0.1 org.apache.felix @@ -66,7 +60,7 @@ org.apache.felix org.apache.felix.scr - 1.0.0 + 1.0.2 End Felix dependencies --> diff --git a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF index 651945ba13..8985947286 100644 --- a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF +++ b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF @@ -10,7 +10,5 @@ Import-Package: org.osgi.framework, org.apache.tuscany.sca.host.embedded, org.osoa.sca, org.osoa.sca.annotations, - org.apache.tuscany.sca.databinding.annotation, - org.apache.tuscany.sca.domain, - org.apache.tuscany.sca.node + org.apache.tuscany.sca.databinding.annotation DynamicImport-Package: * diff --git a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties index 286bbb1229..6a38f48c4a 100644 --- a/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties +++ b/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties @@ -27,12 +27,12 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \ felix.auto.start.1= \ - "file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar" + "file://${FELIX_DIR}/org.apache.felix.scr/1.0.2/org.apache.felix.scr-1.0.2.jar" -# "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar" -# "file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar" \ -# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar" \ -# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar" \ +# "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.1/org.apache.felix.configadmin-1.0.1.jar" +# "file://${FELIX_DIR}/org.apache.felix.shell/1.0.1/org.apache.felix.shell-1.0.1.jar" \ +# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.0.1/org.apache.felix.shell.tui-1.0.1.jar" \ +# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.0.3/org.apache.felix.bundlerepository-1.0.3.jar" \ felix.startlevel.framework=1 diff --git a/java/sca/itest/osgi-tuscany/sca-api/pom.xml b/java/sca/itest/osgi-tuscany/sca-api/pom.xml index f277ae36d0..3c74d327e1 100644 --- a/java/sca/itest/osgi-tuscany/sca-api/pom.xml +++ b/java/sca/itest/osgi-tuscany/sca-api/pom.xml @@ -43,7 +43,7 @@ org.apache.felix maven-bundle-plugin - 1.2.1 + 1.4.0 true diff --git a/java/sca/itest/osgi-tuscany/test-bundles/pom.xml b/java/sca/itest/osgi-tuscany/test-bundles/pom.xml index 3fb17dec84..b53beea930 100644 --- a/java/sca/itest/osgi-tuscany/test-bundles/pom.xml +++ b/java/sca/itest/osgi-tuscany/test-bundles/pom.xml @@ -44,7 +44,7 @@ org.apache.felix org.apache.felix.main - 1.1.0-SNAPSHOT + 1.0.4 diff --git a/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml index 4c04d6869a..9458b5af04 100644 --- a/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml +++ b/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml @@ -291,7 +291,7 @@ org.apache.felix maven-bundle-plugin - 1.2.1 + 1.4.0 true diff --git a/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml index 2559ab706c..756e0eea80 100644 --- a/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml +++ b/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml @@ -324,7 +324,7 @@ org.apache.felix maven-bundle-plugin - 1.2.1 + 1.4.0 true diff --git a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml index 4f9fca93fb..bc0a1399cb 100644 --- a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml +++ b/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml @@ -480,7 +480,6 @@ tuscany-implementation-widget-runtime ${pom.version} - ${pom.groupId} tuscany-policy diff --git a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java index f87e22d464..17b187a86f 100644 --- a/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java +++ b/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java @@ -42,9 +42,6 @@ public class InstallerBundleActivator implements BundleActivator { }; private static final String[] tuscanyModulesToIgnore = { - "node2-api", - "node2-impl", - "node2-launcher", "node2-launcher-webapp", "implementation-node-runtime", // uses node2 "saxon", diff --git a/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml index 58c168cb1d..1d0fba8a83 100644 --- a/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml +++ b/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml @@ -153,7 +153,7 @@ org.apache.felix maven-bundle-plugin - 1.2.1 + 1.4.0 true diff --git a/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml b/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml index 28d55fa2c6..9f59a9303a 100644 --- a/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml +++ b/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml @@ -98,7 +98,7 @@ org.apache.felix maven-bundle-plugin - 1.2.1 + 1.4.0 true -- cgit v1.2.3