Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-09-20 07:34:34 -0400
committerGlyn Normington2010-09-20 07:34:34 -0400
commit4b8d48275c9c3306fd1e95747490c6bd846afc98 (patch)
treebc2fd68c95c6ae91d147304ce2536e3ef194fca8 /test-apps
parent98e05b70a267699addfc11f331b0d6cc19645a53 (diff)
downloadorg.eclipse.virgo.kernel-4b8d48275c9c3306fd1e95747490c6bd846afc98.tar.gz
org.eclipse.virgo.kernel-4b8d48275c9c3306fd1e95747490c6bd846afc98.tar.xz
org.eclipse.virgo.kernel-4b8d48275c9c3306fd1e95747490c6bd846afc98.zip
bug 319369: rename service property in tests
Diffstat (limited to 'test-apps')
-rw-r--r--test-apps/service-scoping/build-par/build.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.global/build.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.global/ivy.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.global/src/main/java/.gitignore0
-rw-r--r--test-apps/service-scoping/scoping.service.module.a/build.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.module.a/ivy.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.module.a/src/main/java/.gitignore0
-rw-r--r--test-apps/service-scoping/scoping.service.module.b/build.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.module.b/ivy.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.module.b/src/main/resources/META-INF/spring/module.xml2
10 files changed, 8 insertions, 8 deletions
diff --git a/test-apps/service-scoping/build-par/build.xml b/test-apps/service-scoping/build-par/build.xml
index 2bfd8703..d3cd9fab 100644
--- a/test-apps/service-scoping/build-par/build.xml
+++ b/test-apps/service-scoping/build-par/build.xml
@@ -8,6 +8,6 @@
<property file="${basedir}/../build.properties"/>
<property name="par.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping.par"/>
- <import file="${basedir}/../../../spring-build/par/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/par/default.xml"/>
</project>
diff --git a/test-apps/service-scoping/scoping.service.global/build.xml b/test-apps/service-scoping/scoping.service.global/build.xml
index a687512f..ae5ca5cb 100644
--- a/test-apps/service-scoping/scoping.service.global/build.xml
+++ b/test-apps/service-scoping/scoping.service.global/build.xml
@@ -4,6 +4,6 @@
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/scoping.service.global.jar"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/service-scoping/scoping.service.global/ivy.xml b/test-apps/service-scoping/scoping.service.global/ivy.xml
index 1e2b9cb4..82fa0501 100644
--- a/test-apps/service-scoping/scoping.service.global/ivy.xml
+++ b/test-apps/service-scoping/scoping.service.global/ivy.xml
@@ -10,7 +10,7 @@
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/service-scoping/scoping.service.global/src/main/java/.gitignore b/test-apps/service-scoping/scoping.service.global/src/main/java/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test-apps/service-scoping/scoping.service.global/src/main/java/.gitignore
diff --git a/test-apps/service-scoping/scoping.service.module.a/build.xml b/test-apps/service-scoping/scoping.service.module.a/build.xml
index eb1852a4..fd6264ca 100644
--- a/test-apps/service-scoping/scoping.service.module.a/build.xml
+++ b/test-apps/service-scoping/scoping.service.module.a/build.xml
@@ -4,6 +4,6 @@
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/service-scoping/scoping.service.module.a/ivy.xml b/test-apps/service-scoping/scoping.service.module.a/ivy.xml
index 6e13fe0a..5353aa8f 100644
--- a/test-apps/service-scoping/scoping.service.module.a/ivy.xml
+++ b/test-apps/service-scoping/scoping.service.module.a/ivy.xml
@@ -10,7 +10,7 @@
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/service-scoping/scoping.service.module.a/src/main/java/.gitignore b/test-apps/service-scoping/scoping.service.module.a/src/main/java/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test-apps/service-scoping/scoping.service.module.a/src/main/java/.gitignore
diff --git a/test-apps/service-scoping/scoping.service.module.b/build.xml b/test-apps/service-scoping/scoping.service.module.b/build.xml
index 69ce7e4d..c294f95b 100644
--- a/test-apps/service-scoping/scoping.service.module.b/build.xml
+++ b/test-apps/service-scoping/scoping.service.module.b/build.xml
@@ -4,6 +4,6 @@
<property file="${basedir}/../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/service-scoping/scoping.service.module.b/ivy.xml b/test-apps/service-scoping/scoping.service.module.b/ivy.xml
index 89025312..913ee02a 100644
--- a/test-apps/service-scoping/scoping.service.module.b/ivy.xml
+++ b/test-apps/service-scoping/scoping.service.module.b/ivy.xml
@@ -10,7 +10,7 @@
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/service-scoping/scoping.service.module.b/src/main/resources/META-INF/spring/module.xml b/test-apps/service-scoping/scoping.service.module.b/src/main/resources/META-INF/spring/module.xml
index 4fac5911..fec4aa46 100644
--- a/test-apps/service-scoping/scoping.service.module.b/src/main/resources/META-INF/spring/module.xml
+++ b/test-apps/service-scoping/scoping.service.module.b/src/main/resources/META-INF/spring/module.xml
@@ -31,7 +31,7 @@
<service id="publishIntoGlobal" interface="java.lang.CharSequence">
<service-properties>
- <beans:entry key="com.springsource.service.scope" value="global" />
+ <beans:entry key="org.eclipse.virgo.service.scope" value="global" />
</service-properties>
<beans:bean class="java.lang.String">
<beans:constructor-arg value="foo"/>

Back to the top