summaryrefslogtreecommitdiffstats
path: root/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources
diff options
context:
space:
mode:
authorrsivaram <rsivaram@13f79535-47bb-0310-9956-ffa450edef68>2008-07-03 12:59:48 +0000
committerrsivaram <rsivaram@13f79535-47bb-0310-9956-ffa450edef68>2008-07-03 12:59:48 +0000
commit668696fac17058aeab5ca6fef79490ca5c8874a0 (patch)
tree82e4e963464f1f10bb9cb3518f9ee668fc62f271 /java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources
parentaf13b17fdca8f3936596a8dffc6c7ef9a197267a (diff)
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
Diffstat (limited to 'java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources')
-rw-r--r--java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF4
-rw-r--r--java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties10
2 files changed, 6 insertions, 8 deletions
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