Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Waibel2015-04-16 05:23:02 -0400
committerFlorian Waibel2015-04-16 05:23:02 -0400
commitf28f5686fd7cfb268ebefac4ed14e1aabc591136 (patch)
tree9bb5d53d117c7e6e7ebaa5e298088b2d197f393e
parent91564e2707f01298566ea7cce9f1a54b0c546533 (diff)
downloadorg.eclipse.virgo.kernel-f28f5686fd7cfb268ebefac4ed14e1aabc591136.tar.gz
org.eclipse.virgo.kernel-f28f5686fd7cfb268ebefac4ed14e1aabc591136.tar.xz
org.eclipse.virgo.kernel-f28f5686fd7cfb268ebefac4ed14e1aabc591136.zip
463462 - Switches to Gradle build
-rw-r--r--.gitignore9
-rw-r--r--build.gradle410
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/template.mf16
-rw-r--r--org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java4
-rw-r--r--org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/DirectoryArtifactFSTests.java2
-rw-r--r--org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/FileArtifactFSTests.java2
-rw-r--r--org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSRefreshTests.java11
-rw-r--r--org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSTests.java2
-rw-r--r--org.eclipse.virgo.kernel.artifact/template.mf12
-rw-r--r--org.eclipse.virgo.kernel.deployer.dm/template.mf12
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/BlueprintDependencyMonitorIntegrationTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java4
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerEdgeTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerLogMessageTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/FactoryConfigurationDeploymentTests.java8
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/NestedPlanIntegrationTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerIntegrationTests.java8
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PropertiesArtifactMBeanTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMBundleRefreshTests.java16
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMConfigurationRefreshTests.java10
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/core/internal/recovery/DeployerRecoveryLogTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/hotenabler/HotDeployerTests.java4
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModelTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/AbstractInstallArtifactTests.java5
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/FileMovingArtifactStoreTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/GenerationalArtifactStoreTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardInstallArtifactGraphInclosureTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/pipeline/stage/transform/internal/SyntheticContextBundleCreatingTransformerTests.java10
-rw-r--r--org.eclipse.virgo.kernel.deployer/template.mf19
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/template.mf8
-rw-r--r--org.eclipse.virgo.kernel.equinox.extensions/src/test/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/PluggableClassLoadingHookTests.java4
-rw-r--r--org.eclipse.virgo.kernel.model/template.mf14
-rw-r--r--org.eclipse.virgo.kernel.osgi/template.mf16
-rw-r--r--org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/repository/internal/RepositoryFactoryBeanTests.java8
-rw-r--r--org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/StandardWorkAreaTests.java12
-rw-r--r--org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/WorkAreaServiceFactoryTests.java2
-rw-r--r--org.eclipse.virgo.kernel.services/template.mf14
-rw-r--r--org.eclipse.virgo.kernel.stubs/template.mf4
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/ffdc/test/FFDCServiceAspectTests.java2
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java2
-rw-r--r--org.eclipse.virgo.kernel.test/template.mf8
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/AbstractOsgiFrameworkLaunchingTests.java10
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/BundleUpdateTests.java4
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java4
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java24
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd6
-rw-r--r--org.eclipse.virgo.kernel.userregion/template.mf18
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/template.mf8
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/UploadServletTests.java2
-rw-r--r--org.eclipse.virgo.management.console/template.mf8
-rw-r--r--org.eclipse.virgo.management.fragment/template.mf4
-rw-r--r--org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/InstallCompleterTests.java2
-rw-r--r--org.eclipse.virgo.shell.command/template.mf18
56 files changed, 607 insertions, 185 deletions
diff --git a/.gitignore b/.gitignore
index 01f8bd69..3fbb1036 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,13 @@
*/src/main/resources/META-INF/MANIFEST.MF
*/src/test/resources/META-INF/TEST.MF
-junit*.properties
target
integration-repo
ivy-cache
-derby.log
.ant-targets-build.xml
-com.cenqua.clover.core.prefs
user-ivy.properties
+bin/
+build/
+.settings/
+.project
+.classpath
+
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..9d92e220
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,410 @@
+import java.util.jar.JarEntry
+import java.util.jar.JarOutputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import java.util.zip.ZipOutputStream
+
+def customOrder(ZipEntry a, ZipEntry b) {
+ if (a.name == 'META-INF/MANIFEST.MF' && b.name == 'META-INF/MANIFEST.MF') return 0
+ if (a.name == 'META-INF/MANIFEST.MF') return -1
+ if (b.name == 'META-INF/MANIFEST.MF') return 1
+ return a.name.compareTo(b.name)
+}
+
+project(':kernel:org.eclipse.virgo.kernel.agent.dm') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':test:org.eclipse.virgo.test.stubs')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.springframework", name: "org.springframework.core", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ compile group: "org.springframework", name: "org.springframework.context", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ compile group: "org.springframework", name: "org.springframework.beans", version: springframeworkVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.gemini", name: "org.eclipse.gemini.blueprint.core", version: geminiBlueprintVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.gemini", name: "org.eclipse.gemini.blueprint.extender", version: geminiBlueprintVersion, configuration: "compile", ext: "jar"
+
+ compile project(':util:org.eclipse.virgo.util.osgi')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ }
+}
+
+project(':kernel:org.eclipse.virgo.kernel.artifact') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+
+ compile project(':util:org.eclipse.virgo.util.common')
+ compile project(':util:org.eclipse.virgo.util.io')
+ compile project(':util:org.eclipse.virgo.util.osgi.manifest')
+ compile project(':util:org.eclipse.virgo.util.parser.manifest')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ compile project(':repository:org.eclipse.virgo.repository')
+ }
+}
+
+project(':kernel:org.eclipse.virgo.kernel.deployer') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':medic:org.eclipse.virgo.medic.test')
+ testCompile project(':test:org.eclipse.virgo.test.stubs')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.springframework", name: "org.springframework.beans", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ compile group: "org.springframework", name: "org.springframework.context", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ compile group: "org.springframework", name: "org.springframework.core", version: springframeworkVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.gemini", name: "org.eclipse.gemini.blueprint.core", version: geminiBlueprintVersion, configuration: "compile", ext: "jar"
+
+ compile project(':kernel:org.eclipse.virgo.kernel.artifact')
+ compile project(':kernel:org.eclipse.virgo.kernel.osgi')
+ compile project(':kernel:org.eclipse.virgo.kernel.services')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ compile project(':nano:org.eclipse.virgo.nano.deployer.api')
+ compile project(':nano:org.eclipse.virgo.nano.deployer.hot')
+ compile project(':repository:org.eclipse.virgo.repository')
+ compile project(':util:org.eclipse.virgo.util.common')
+ compile project(':util:org.eclipse.virgo.util.io')
+ compile project(':util:org.eclipse.virgo.util.jmx')
+ compile project(':util:org.eclipse.virgo.util.math')
+ compile project(':util:org.eclipse.virgo.util.osgi.manifest')
+
+ if (System.properties['weaving.enabled'] == 'true') {
+ aspectpath project(':medic:org.eclipse.virgo.medic')
+ aspectpath project(':nano:org.eclipse.virgo.nano.core')
+ aspectpath project(':util:org.eclipse.virgo.util.jmx')
+ }
+ }
+}
+
+project(':kernel:org.eclipse.virgo.kernel.deployer.dm') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':medic:org.eclipse.virgo.medic.test')
+ testCompile project(':test:org.eclipse.virgo.test.stubs')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.springframework", name: "org.springframework.beans", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ compile group: "org.springframework", name: "org.springframework.context", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ compile group: "org.springframework", name: "org.springframework.core", version: springframeworkVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.gemini", name: "org.eclipse.gemini.blueprint.core", version: geminiBlueprintVersion, configuration: "compile", ext: "jar"
+
+ compile project(':kernel:org.eclipse.virgo.kernel.agent.dm')
+ compile project(':kernel:org.eclipse.virgo.kernel.deployer')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+
+ if (System.properties['weaving.enabled'] == 'true') {
+ aspectpath project(':medic:org.eclipse.virgo.medic')
+ }
+ }
+}
+
+project(':kernel:org.eclipse.virgo.kernel.dmfragment') {
+ dependencies {
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.springframework", name: "org.springframework.beans", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ compile group: "org.springframework", name: "org.springframework.context", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ compile group: "org.springframework", name: "org.springframework.context.support", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ compile group: "org.springframework", name: "org.springframework.core", version: springframeworkVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.gemini", name: "org.eclipse.gemini.blueprint.core", version: geminiBlueprintVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.gemini", name: "org.eclipse.gemini.blueprint.extender", version: geminiBlueprintVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.gemini", name: "org.eclipse.gemini.blueprint.io", version: geminiBlueprintVersion, configuration: "compile", ext: "jar"
+
+ compile project(':kernel:org.eclipse.virgo.kernel.agent.dm')
+ compile project(':kernel:org.eclipse.virgo.kernel.osgi')
+ compile project(':kernel:org.eclipse.virgo.kernel.deployer')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+
+ if (System.properties['weaving.enabled'] == 'true') {
+ aspectpath project(':medic:org.eclipse.virgo.medic')
+ }
+ }
+}
+
+project(':kernel:org.eclipse.virgo.kernel.model') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':test:org.eclipse.virgo.test.stubs')
+ testCompile project(':kernel:org.eclipse.virgo.kernel.stubs')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
+
+ compile project(':kernel:org.eclipse.virgo.kernel.osgi')
+ compile project(':kernel:org.eclipse.virgo.kernel.deployer')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ compile project(':nano:org.eclipse.virgo.nano.deployer.api')
+ compile project(':util:org.eclipse.virgo.util.jmx')
+
+ aspectpath project(':nano:org.eclipse.virgo.nano.core')
+
+ if (System.properties['weaving.enabled'] == 'true') {
+ aspectpath project(':medic:org.eclipse.virgo.medic')
+ aspectpath project(':util:org.eclipse.virgo.util.jmx')
+ }
+ }
+}
+
+project(':kernel:org.eclipse.virgo.kernel.osgi') {
+ dependencies {
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
+
+ compile project(':util:org.eclipse.virgo.util.osgi.manifest')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ compile project(':kernel:org.eclipse.virgo.kernel.artifact')
+
+ aspectpath project(':nano:org.eclipse.virgo.nano.core')
+ }
+}
+
+project(':kernel:org.eclipse.virgo.kernel.equinox.extensions') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':test:org.eclipse.virgo.test.stubs')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ }
+}
+
+project(':kernel:org.eclipse.virgo.kernel.stubs') {
+ dependencies {
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+
+ compile project(':util:org.eclipse.virgo.util.common')
+ compile project(':util:org.eclipse.virgo.util.osgi.manifest')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ compile project(':nano:org.eclipse.virgo.nano.deployer.api')
+ compile project(':kernel:org.eclipse.virgo.kernel.artifact')
+ compile project(':kernel:org.eclipse.virgo.kernel.deployer')
+ compile project(':kernel:org.eclipse.virgo.kernel.osgi')
+ }
+}
+
+project(':kernel:org.eclipse.virgo.kernel.services') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':test:org.eclipse.virgo.test.stubs')
+ testCompile project(':medic:org.eclipse.virgo.medic.test')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.springframework", name: "org.springframework.beans", version: springframeworkVersion, configuration: "compile", ext: "jar"
+
+ compile project(':util:org.eclipse.virgo.util.math')
+ compile project(':util:org.eclipse.virgo.util.io')
+ compile project(':util:org.eclipse.virgo.util.osgi.manifest')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ compile project(':repository:org.eclipse.virgo.repository')
+ compile project(':kernel:org.eclipse.virgo.kernel.artifact')
+ }
+
+ task rewriteJar(dependsOn: jar) {
+ tasks['assemble'].dependsOn('rewriteJar')
+ String jarFileName
+ // store name of the created jar file
+ jar.outputs.files.each {
+ println it.getPath()
+ jarFileName = it.getPath()
+ }
+ doLast() {
+ ZipFile jarFile = new ZipFile(jarFileName)
+ println "------------"
+ println "Reordering content of jar file ${jarFileName}:"
+ println "------------"
+ new ZipFile(jarFileName).entries().findAll{ !it.directory }.each { println it.name }
+ println "------------"
+ String cloneFileName = new File(jarFileName).path + "-clone"
+ FileOutputStream fos = new FileOutputStream(cloneFileName)
+
+ String manifest
+ jarFile.entries().findAll { it.name == "META-INF/MANIFEST.MF" }.each {
+ manifest = jarFile.getInputStream(it).text
+ }
+ println "------------"
+ println manifest
+ println "------------"
+
+ JarOutputStream jarOutputStream = new JarOutputStream(fos,
+ new java.util.jar.Manifest(new ByteArrayInputStream(manifest.getBytes(java.nio.charset.Charset.forName("UTF-8")))))
+
+ println "------------"
+ byte[] readBuffer = new byte[2156]
+ jarFile.entries().findAll { !it.directory && !(it.name == "META-INF/MANIFEST.MF") }.sort( {a,b -> customOrder(a,b) } ).each {
+ println "adding ${it.name} to ${cloneFileName}"
+ jarOutputStream.putNextEntry(new JarEntry(it.name))
+ jarOutputStream << jarFile.getInputStream(it)
+ }
+ jarOutputStream.finish()
+ println "finished writing ${cloneFileName}"
+ println "------------"
+
+ println "from ${cloneFileName} to ${jarFileName}"
+ println "within ${file(cloneFileName).parentFile.path} is ${file(cloneFileName).name}"
+ println "rename ${file(cloneFileName).name} -> ${file(jarFileName).name}"
+
+ delete file(jarFileName)
+ copy {
+ from file(file(cloneFileName).parentFile.path)
+ into file(file(cloneFileName).parentFile.path)
+ rename { String fileName ->
+ fileName.replace(file(cloneFileName).name, file(jarFileName).name)
+ }
+ }
+ delete file(cloneFileName)
+ println "------------"
+ println "Reordered content of jar file ${jarFileName}:"
+ println "------------"
+ new ZipFile(jarFileName).entries().findAll{ !it.directory }.each { println it.name }
+ println "------------"
+ }
+ }
+}
+
+project(':kernel:org.eclipse.virgo.kernel.userregion') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':test:org.eclipse.virgo.test.stubs')
+ testCompile project(':medic:org.eclipse.virgo.medic.test')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
+
+ compile project(':util:org.eclipse.virgo.util.common')
+ compile project(':util:org.eclipse.virgo.util.math')
+ compile project(':util:org.eclipse.virgo.util.io')
+ compile project(':util:org.eclipse.virgo.util.osgi')
+ compile project(':util:org.eclipse.virgo.util.osgi.manifest')
+ compile project(':util:org.eclipse.virgo.util.parser.manifest')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ compile project(':nano:org.eclipse.virgo.nano.deployer.api')
+ compile project(':repository:org.eclipse.virgo.repository')
+ compile project(':kernel:org.eclipse.virgo.kernel.artifact')
+ compile project(':kernel:org.eclipse.virgo.kernel.osgi')
+ compile project(':kernel:org.eclipse.virgo.kernel.deployer')
+ compile project(':kernel:org.eclipse.virgo.kernel.services')
+ compile project(':kernel:org.eclipse.virgo.kernel.equinox.extensions')
+ }
+}
+
+project(':kernel:org.eclipse.virgo.kernel.userregionfactory') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':test:org.eclipse.virgo.test.stubs')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
+
+ compile project(':util:org.eclipse.virgo.util.parser.launcher')
+ compile project(':util:org.eclipse.virgo.util.osgi')
+ compile project(':util:org.eclipse.virgo.util.osgi.manifest')
+ compile project(':util:org.eclipse.virgo.util.parser.manifest')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ compile project(':kernel:org.eclipse.virgo.kernel.osgi')
+ }
+}
+
+project(':kernel:org.eclipse.virgo.shell.command') {
+ dependencies {
+ testCompile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.nop", version: slf4jNopVersion, configuration: "compile", ext: "jar"
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':test:org.eclipse.virgo.test.stubs')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.apache.felix.gogo.runtime", version: gogoRuntimeVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.springframework", name: "org.springframework.core", version: springframeworkVersion, configuration: "compile", ext: "jar"
+
+ compile project(':kernel:org.eclipse.virgo.kernel.deployer')
+ compile project(':kernel:org.eclipse.virgo.kernel.model')
+ compile project(':kernel:org.eclipse.virgo.kernel.osgi')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.deployer.api')
+ compile project(':repository:org.eclipse.virgo.repository')
+ compile project(':util:org.eclipse.virgo.util.common')
+ compile project(':util:org.eclipse.virgo.util.io')
+ compile project(':util:org.eclipse.virgo.util.osgi')
+ compile project(':util:org.eclipse.virgo.util.osgi.manifest')
+
+ if (System.properties['weaving.enabled'] == 'true') {
+ aspectpath project(':medic:org.eclipse.virgo.medic')
+ }
+ }
+}
+
+project(':kernel:org.eclipse.virgo.management.fragment') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.gemini", name: "org.eclipse.gemini.management", version: geminiManagementVersion, configuration: "compile", ext: 'jar'
+ }
+}
+
+project(':kernel:org.eclipse.virgo.management.console') {
+ dependencies {
+ testCompile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.nop", version: slf4jNopVersion, configuration: "compile", ext: "jar"
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile group: "org.springframework", name: "org.springframework.core", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ testCompile group: "org.springframework", name: "org.springframework.test", version: springframeworkVersion, configuration: "compile", ext: "jar"
+ testCompile group: "org.eclipse.virgo.mirrored", name: "org.mozilla.javascript", version: mozillaJavascriptVersion, configuration: "compile", ext: "jar"
+ testCompile group: "org.apache.commons", name: "com.springsource.org.apache.commons.logging", version: commonsLoggingVersion, configuration: "compile", ext: "jar"
+ testCompile group: "org.apache.commons", name: "com.springsource.org.apache.commons.io", version: commonsIoVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "javax.servlet", version: javaxServletVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+ runtime group: "org.eclipse.osgi", name: "org.eclipse.equinox.http", version: equinoxHttp, configuration: "runtime", ext: "jar"
+
+ compile group: "org.eclipse.gemini", name: "org.eclipse.gemini.management", version: geminiManagementVersion, configuration: "compile", ext: 'jar'
+
+ compile group: "org.apache.commons", name: "com.springsource.org.apache.commons.fileupload", version: commonsFileuploadVersion, configuration: "compile", ext: "jar"
+ compile group: "org.jolokia", name: "org.jolokia.osgi", version: jolokiaVersion, configuration: "compile", ext: "jar"
+ }
+}
diff --git a/org.eclipse.virgo.kernel.agent.dm/template.mf b/org.eclipse.virgo.kernel.agent.dm/template.mf
index 6211978a..dfdb77df 100644
--- a/org.eclipse.virgo.kernel.agent.dm/template.mf
+++ b/org.eclipse.virgo.kernel.agent.dm/template.mf
@@ -7,15 +7,15 @@ Excluded-Exports:
*.internal.*
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
- org.eclipse.gemini.blueprint.*;version="${org.eclipse.gemini.blueprint:[=.=.=, +1)}",
- org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1)}",
+ org.eclipse.equinox.region.*;version="${equinoxRegionVersion:[=.=.=, =.+1)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
org.osgi.*;version="0",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
org.osgi.*;version="0",
org.eclipse.osgi.*;version="0"
Service-Component: OSGI-INF/dm_agent.xml, OSGI-INF/agentdm_start_tracker.xml
diff --git a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java
index 207b4803..b5dad3d6 100644
--- a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java
+++ b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/bundle/BundleBridgeTests.java
@@ -91,7 +91,7 @@ public class BundleBridgeTests {
@Test
public void testGenerateArtefact() throws ArtifactGenerationException {
File jarsDirectory = new File(
- System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.eclipse.virgo.mirrored/org.apache.commons.dbcp/1.4.0.v201204271417/org.apache.commons.dbcp-1.4.0.v201204271417.jar");
+ System.getProperty("user.home") + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/org.apache.commons.dbcp/1.4.0.v201204271417/4378c1a6c057f1e1da2b8287351b288c2c13e6c0/org.apache.commons.dbcp-1.4.0.v201204271417.jar");
File directoriesDirectory = new File("./src/test/resources/directories");
Set<ArtifactDescriptor> artefacts = new HashSet<ArtifactDescriptor>();
@@ -128,7 +128,7 @@ public class BundleBridgeTests {
@Test
public void testBuildDictionary() throws ArtifactGenerationException, IOException {
File testFile = new File(
- System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.eclipse.virgo.mirrored/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar");
+ System.getProperty("user.home") + "/.gradle/caches/modules-2/files-2.1/org.eclipse.virgo.mirrored/javax.servlet/3.0.0.v201112011016/c91fbdc81fe6537ab86ddd713881daf9e49406ea/javax.servlet-3.0.0.v201112011016.jar");
ArtifactDescriptor inputArtefact = BUNDLE_BRIDGE.generateArtifactDescriptor(testFile);
diff --git a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/DirectoryArtifactFSTests.java b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/DirectoryArtifactFSTests.java
index fd240e05..3da108b4 100644
--- a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/DirectoryArtifactFSTests.java
+++ b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/DirectoryArtifactFSTests.java
@@ -22,7 +22,7 @@ import org.junit.Test;
public class DirectoryArtifactFSTests {
- private final DirectoryArtifactFS artifactFS = new DirectoryArtifactFS(new File("target"));
+ private final DirectoryArtifactFS artifactFS = new DirectoryArtifactFS(new File("build"));
@Test
public void getEntry() {
diff --git a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/FileArtifactFSTests.java b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/FileArtifactFSTests.java
index ee40067e..e1d2bc8a 100644
--- a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/FileArtifactFSTests.java
+++ b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/FileArtifactFSTests.java
@@ -26,7 +26,7 @@ public class FileArtifactFSTests {
@Test(expected = IllegalArgumentException.class)
public void constructorDirectory() {
- new FileArtifactFS(new File("target"));
+ new FileArtifactFS(new File("build"));
}
@Test(expected = IllegalArgumentException.class)
diff --git a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSRefreshTests.java b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSRefreshTests.java
index 9f833a62..4328a732 100644
--- a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSRefreshTests.java
+++ b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSRefreshTests.java
@@ -35,7 +35,7 @@ public class JarFileArtifactFSRefreshTests {
@Before
public void setUp() throws Exception {
- this.pr = new PathReference("./target/redeploy-refresh");
+ this.pr = new PathReference("./build/redeploy-refresh");
this.pr.delete(true);
this.pr.createDirectory();
this.testModule = this.pr.newChild("simple.module.jar");
@@ -46,7 +46,7 @@ public class JarFileArtifactFSRefreshTests {
PathReference simpleModule = new PathReference("src/test/resources/refresh/simple.module.jar");
simpleModule.copy(this.testModule);
- ArtifactFS artifactFS = new JarFileArtifactFS(new PathReference("./target/redeploy-refresh/simple.module.jar").toFile());
+ ArtifactFS artifactFS = new JarFileArtifactFS(new PathReference("./build/redeploy-refresh/simple.module.jar").toFile());
checkBsn(artifactFS, "simple.module");
@@ -54,7 +54,7 @@ public class JarFileArtifactFSRefreshTests {
this.testModule.moveTo(old);
new PathReference("src/test/resources/refresh/simple2.module.jar").copy(this.testModule);
- JarFileArtifactFS fs = new JarFileArtifactFS(new PathReference("./target/redeploy-refresh/simple.module.jar").toFile());
+ JarFileArtifactFS fs = new JarFileArtifactFS(new PathReference("./build/redeploy-refresh/simple.module.jar").toFile());
checkBsn(fs, "simple2.module");
}
@@ -62,7 +62,10 @@ public class JarFileArtifactFSRefreshTests {
public void checkBsn(ArtifactFS artifactFS, String bsn) throws IOException {
ArtifactFSEntry entry = artifactFS.getEntry("META-INF/MANIFEST.MF");
InputStream inputStream = entry.getInputStream();
- String manifest = new Scanner(inputStream).useDelimiter("\\A").next();
+ String manifest;
+ try (Scanner scanner = new Scanner(inputStream)) {
+ manifest = scanner.useDelimiter("\\A").next();
+ }
assertTrue(manifest.contains(bsn));
inputStream.close();
}
diff --git a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSTests.java b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSTests.java
index f79b4a1f..ec0f2d5d 100644
--- a/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSTests.java
+++ b/org.eclipse.virgo.kernel.artifact/src/test/java/org/eclipse/virgo/kernel/artifact/fs/internal/JarFileArtifactFSTests.java
@@ -32,7 +32,7 @@ public class JarFileArtifactFSTests {
@Test(expected = IllegalArgumentException.class)
public void constructorDirectory() {
- new JarFileArtifactFS(new File("target"));
+ new JarFileArtifactFS(new File("build"));
}
/**
diff --git a/org.eclipse.virgo.kernel.artifact/template.mf b/org.eclipse.virgo.kernel.artifact/template.mf
index 69099d89..5ec7b8c5 100644
--- a/org.eclipse.virgo.kernel.artifact/template.mf
+++ b/org.eclipse.virgo.kernel.artifact/template.mf
@@ -5,14 +5,14 @@ Bundle-SymbolicName: org.eclipse.virgo.kernel.artifact
Bundle-Version: ${version}
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.repository.*;version="${org.eclipse.virgo.repository:[=.=.=, =.+1)}",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
org.osgi.framework.*;version="0",
org.osgi.service.cm.*;version="0",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
javax.xml.*;version="0",
org.xml.*;version="0",
org.w3c.*;version="0"
diff --git a/org.eclipse.virgo.kernel.deployer.dm/template.mf b/org.eclipse.virgo.kernel.deployer.dm/template.mf
index 05e16220..d14f2f0c 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/template.mf
+++ b/org.eclipse.virgo.kernel.deployer.dm/template.mf
@@ -5,10 +5,10 @@ Bundle-SymbolicName: org.eclipse.virgo.kernel.deployer.dm
Bundle-Version: ${version}
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
org.osgi.framework.*;version="0",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
- org.eclipse.gemini.blueprint.*;version="${org.eclipse.gemini.blueprint:[=.=.=, +1)}"
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1)}"
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/BlueprintDependencyMonitorIntegrationTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/BlueprintDependencyMonitorIntegrationTests.java
index 4ee87cdf..9c680e89 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/BlueprintDependencyMonitorIntegrationTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/BlueprintDependencyMonitorIntegrationTests.java
@@ -27,7 +27,7 @@ import org.junit.Test;
*/
public class BlueprintDependencyMonitorIntegrationTests extends AbstractDeployerIntegrationTest {
- private static final File LOG_FILE = new File("target/serviceability/eventlog/eventlog.log");
+ private static final File LOG_FILE = new File("build/serviceability/eventlog/eventlog.log");
private int existingLines;
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java
index b1b47825..828ef548 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/CommonsDbcpTests.java
@@ -26,9 +26,9 @@ public class CommonsDbcpTests extends AbstractDeployerIntegrationTest {
@BeforeClass
public static void setupDatabase() {
- FileSystemUtils.deleteRecursively(new File("target/db"));
+ FileSystemUtils.deleteRecursively(new File("build/db"));
server = new Server();
- server.setDatabasePath(0, "target/db/commons-dbcp-test-db");
+ server.setDatabasePath(0, "build/db/commons-dbcp-test-db");
server.setDatabaseName(0, "");
server.setSilent(true);
server.start();
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java
index 445faedd..4a90e7cb 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ConfigurationDeploymentTests.java
@@ -123,7 +123,7 @@ public class ConfigurationDeploymentTests extends AbstractDeployerIntegrationTes
@Test
public void testHotDeployConfig() throws Exception {
File source = new File("src/test/resources/configuration.deployment/t.properties");
- File target = new File("target/pickup/t.properties");
+ File target = new File("build/pickup/t.properties");
if (target.exists()) {
assertTrue(target.delete());
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerEdgeTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerEdgeTests.java
index ed0c080f..33f68d13 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerEdgeTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerEdgeTests.java
@@ -259,7 +259,7 @@ public class DeployerEdgeTests extends AbstractDeployerIntegrationTest {
@Test(expected = DeploymentException.class)
public void testNonBundleDirectory() throws Exception {
- URI dirURI = new File("target").toURI();
+ URI dirURI = new File("build").toURI();
this.appDeployer.deploy(dirURI);
}
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerLogMessageTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerLogMessageTests.java
index 4590debe..80252b4c 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerLogMessageTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/DeployerLogMessageTests.java
@@ -33,7 +33,7 @@ import org.junit.Test;
@ConfigLocation("META-INF/no.heap.dump.test.config.properties")
public class DeployerLogMessageTests extends AbstractParTests {
- private static final File LOG_FILE = new File("target/serviceability/eventlog/eventlog.log");
+ private static final File LOG_FILE = new File("build/serviceability/eventlog/eventlog.log");
private int existingLines;
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/FactoryConfigurationDeploymentTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/FactoryConfigurationDeploymentTests.java
index 75a2e023..c99a05c5 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/FactoryConfigurationDeploymentTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/FactoryConfigurationDeploymentTests.java
@@ -176,7 +176,7 @@ public class FactoryConfigurationDeploymentTests extends AbstractDeployerIntegra
hotDeployConfiguration.setProperty("prop1", "prop1");
hotDeployConfiguration.setProperty("prop2", "2");
- File target = new File("target/pickup/factory-config-a-hot.properties");
+ File target = new File("build/pickup/factory-config-a-hot.properties");
if (target.exists()) {
assertTrue(target.delete());
@@ -232,7 +232,7 @@ public class FactoryConfigurationDeploymentTests extends AbstractDeployerIntegra
hotDeployConfiguration.setProperty("prop1", "prop1");
hotDeployConfiguration.setProperty("prop2", "2");
- File target = new File("target/pickup/factory-config-a-hot-update.properties");
+ File target = new File("build/pickup/factory-config-a-hot-update.properties");
if (target.exists()) {
assertTrue(target.delete());
@@ -321,8 +321,8 @@ public class FactoryConfigurationDeploymentTests extends AbstractDeployerIntegra
configTwo.setProperty("prop1", "prop2");
configTwo.setProperty("prop2", "2");
- final File targetOne = new File("target/pickup/factory-config-a-hot-update-1.properties");
- final File targetTwo = new File("target/pickup/factory-config-a-hot-update-2.properties");
+ final File targetOne = new File("build/pickup/factory-config-a-hot-update-1.properties");
+ final File targetTwo = new File("build/pickup/factory-config-a-hot-update-2.properties");
if (targetOne.exists()) {
assertTrue(targetOne.delete());
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java
index 3cbfd0ea..64cb90e9 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java
@@ -60,7 +60,7 @@ public class HotDeploymentTests extends AbstractDeployerIntegrationTest {
}
private void doTest(PathReference artifact, String type, String name, String version) throws DeploymentException {
- PathReference copyInPickup = artifact.copy(new PathReference("target/pickup"), true);
+ PathReference copyInPickup = artifact.copy(new PathReference("build/pickup"), true);
try {
while (!this.deployer.isDeployed(copyInPickup.toURI())) {
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/NestedPlanIntegrationTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/NestedPlanIntegrationTests.java
index db6c3c36..b7daa661 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/NestedPlanIntegrationTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/NestedPlanIntegrationTests.java
@@ -86,7 +86,7 @@ public class NestedPlanIntegrationTests extends AbstractDeployerIntegrationTest
private static final String TEST_RESOURCES_DIRECTORY = "src/test/resources/plan-deployment/";
- private static final String GENERATED_PLAN_DIRECTORY = "target/watched/";
+ private static final String GENERATED_PLAN_DIRECTORY = "build/watched/";
private static final String PLAN_EXTENSION = ".plan";
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerIntegrationTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerIntegrationTests.java
index ed3e9e8d..24b8b61f 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerIntegrationTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PipelinedDeployerIntegrationTests.java
@@ -45,9 +45,9 @@ public class PipelinedDeployerIntegrationTests extends AbstractDeployerIntegrati
private static final int POLLING_INTERVAL_MILLIS = 100;
- private final PathReference pickup = new PathReference("./target/pickup");
+ private final PathReference pickup = new PathReference("./build/pickup");
- private final PathReference target = new PathReference("./target");
+ private final PathReference target = new PathReference("./build");
private StubInstallArtifactLifecycleListener lifecycleListener;
@@ -61,7 +61,7 @@ public class PipelinedDeployerIntegrationTests extends AbstractDeployerIntegrati
@Before
public void setUp() throws Exception {
- PathReference pr = new PathReference("./target/deployer");
+ PathReference pr = new PathReference("./build/deployer");
pr.delete(true);
pr.createDirectory();
@@ -127,7 +127,7 @@ public class PipelinedDeployerIntegrationTests extends AbstractDeployerIntegrati
undeploy();
this.lifecycleListener.assertLifecycleCounts(1, 1, 1, 1);
- File workDir = new File("target/work/org.eclipse.virgo.kernel/Module/dummy.jar-0");
+ File workDir = new File("build/work/org.eclipse.virgo.kernel/Module/dummy.jar-0");
assertFalse(workDir.exists());
assertEquals(1, this.watchableRepository.getCheckCount());
}
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java
index c804e327..39539793 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java
@@ -32,7 +32,7 @@ public class PlanUriIntegrationTests extends AbstractDeployerIntegrationTest {
private static final String TEST_RESOURCES_DIRECTORY = "src/test/resources/plan-deployment/";
- private static final String GENERATED_PLAN_DIRECTORY = "target/PlanUriIntegrationTests/";
+ private static final String GENERATED_PLAN_DIRECTORY = "build/PlanUriIntegrationTests/";
private static final String PLAN_EXTENSION = ".plan";
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PropertiesArtifactMBeanTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PropertiesArtifactMBeanTests.java
index ec7dd1a5..eb949855 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PropertiesArtifactMBeanTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PropertiesArtifactMBeanTests.java
@@ -54,7 +54,7 @@ public class PropertiesArtifactMBeanTests extends AbstractDeployerIntegrationTes
@Test
public void lifecycle() throws DeploymentException, IOException, InvalidSyntaxException, JMException {
- File artifactFile = new File("target/test.properties");
+ File artifactFile = new File("build/test.properties");
FileCopyUtils.copy(new File("src/test/resources/test.properties"), artifactFile);
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMBundleRefreshTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMBundleRefreshTests.java
index b68193c8..7974cdb0 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMBundleRefreshTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMBundleRefreshTests.java
@@ -41,7 +41,7 @@ public class RAMBundleRefreshTests extends AbstractRAMIntegrationTests {
@Test
public void refresh() throws DeploymentException {
- PathReference copyToDeploy = new PathReference("target/initial.jar");
+ PathReference copyToDeploy = new PathReference("build/initial.jar");
if (copyToDeploy.exists() && !copyToDeploy.delete(true)) {
fail("Failed to delete " + copyToDeploy);
}
@@ -92,14 +92,14 @@ public class RAMBundleRefreshTests extends AbstractRAMIntegrationTests {
@Test
public void refreshWithinAnUnscopedPlan() throws DeploymentException, InterruptedException {
- PathReference watchedRepository = new PathReference("target/watched");
+ PathReference watchedRepository = new PathReference("build/watched");
if (watchedRepository.exists() && ! watchedRepository.delete(true)) {
fail("Failed to delete watched repository");
}
watchedRepository.createDirectory();
- PathReference copyToDeploy = new PathReference("target/watched/refresh.jar");
+ PathReference copyToDeploy = new PathReference("build/watched/refresh.jar");
PathReference original = new PathReference("src/test/resources/ram-bundle-refresh/initial.jar");
original.copy(copyToDeploy, true);
@@ -134,7 +134,7 @@ public class RAMBundleRefreshTests extends AbstractRAMIntegrationTests {
@Test
public void refreshWithinAPar() throws DeploymentException {
- PathReference copyToDeploy = new PathReference("target/bundle-refresh.par");
+ PathReference copyToDeploy = new PathReference("build/bundle-refresh.par");
if (copyToDeploy.exists() && !copyToDeploy.delete(true)) {
fail("Failed to delete " + copyToDeploy);
}
@@ -147,7 +147,7 @@ public class RAMBundleRefreshTests extends AbstractRAMIntegrationTests {
assertStateOfScopedInitialBundle();
PathReference refreshSource = new PathReference("src/test/resources/ram-bundle-refresh/new-entry.jar");
- PathReference refreshTarget = new PathReference("target/bundle-refresh.par/initial.jar");
+ PathReference refreshTarget = new PathReference("build/bundle-refresh.par/initial.jar");
refreshTarget.delete(true);
refreshSource.copy(refreshTarget, true);
@@ -185,18 +185,18 @@ public class RAMBundleRefreshTests extends AbstractRAMIntegrationTests {
@Test
public void refreshWithinAnUnscopedPlanWithAScopedParent() throws DeploymentException, InterruptedException {
- PathReference watchedRepository = new PathReference("target/watched");
+ PathReference watchedRepository = new PathReference("build/watched");
if (watchedRepository.exists() && ! watchedRepository.delete(true)) {
fail("Failed to delete watched repository");
}
watchedRepository.createDirectory();
- PathReference copyToDeploy = new PathReference("target/watched/refresh.jar");
+ PathReference copyToDeploy = new PathReference("build/watched/refresh.jar");
PathReference original = new PathReference("src/test/resources/ram-bundle-refresh/initial.jar");
original.copy(copyToDeploy, true);
- new PathReference("src/test/resources/ram-bundle-refresh/test.plan").copy(new PathReference("target/watched/test.plan"));
+ new PathReference("src/test/resources/ram-bundle-refresh/test.plan").copy(new PathReference("build/watched/test.plan"));
Thread.sleep(2000);
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMConfigurationRefreshTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMConfigurationRefreshTests.java
index 6beaa672..7ad27345 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMConfigurationRefreshTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RAMConfigurationRefreshTests.java
@@ -39,7 +39,7 @@ public class RAMConfigurationRefreshTests extends AbstractRAMIntegrationTests {
@Test
public void refresh() throws DeploymentException, IOException, InvalidSyntaxException {
- PathReference copyToDeploy = new PathReference("target/test.properties");
+ PathReference copyToDeploy = new PathReference("build/test.properties");
if (copyToDeploy.exists() && !copyToDeploy.delete()) {
fail("Failed to delete " + copyToDeploy);
}
@@ -67,7 +67,7 @@ public class RAMConfigurationRefreshTests extends AbstractRAMIntegrationTests {
@Test
public void refreshWithinAPar() throws DeploymentException, IOException, InvalidSyntaxException {
- PathReference copyToDeploy = new PathReference("target/config-refresh.par");
+ PathReference copyToDeploy = new PathReference("build/config-refresh.par");
if (copyToDeploy.exists() && !copyToDeploy.delete(true)) {
fail("Failed to delete " + copyToDeploy);
}
@@ -98,19 +98,19 @@ public class RAMConfigurationRefreshTests extends AbstractRAMIntegrationTests {
@Test
public void refreshWithinAPlan() throws DeploymentException, IOException, InvalidSyntaxException, InterruptedException {
- PathReference watchedRepository = new PathReference("target/watched");
+ PathReference watchedRepository = new PathReference("build/watched");
if (watchedRepository.exists() && ! watchedRepository.delete(true)) {
fail("Failed to delete watched repository");
}
watchedRepository.createDirectory();
- PathReference copyToDeploy = new PathReference("target/watched/test.properties");
+ PathReference copyToDeploy = new PathReference("build/watched/test.properties");
if (copyToDeploy.exists() && !copyToDeploy.delete(true)) {
fail("Failed to delete " + copyToDeploy);
}
- PathReference configurationCopy = new PathReference("target/watched/test.properties");
+ PathReference configurationCopy = new PathReference("build/watched/test.properties");
new PathReference("src/test/resources/ram-config-refresh/test.properties").copy(configurationCopy);
Thread.sleep(2000);
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/core/internal/recovery/DeployerRecoveryLogTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/core/internal/recovery/DeployerRecoveryLogTests.java
index 9e851471..a40b29a4 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/core/internal/recovery/DeployerRecoveryLogTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/core/internal/recovery/DeployerRecoveryLogTests.java
@@ -29,7 +29,7 @@ import org.eclipse.virgo.util.io.PathReference;
public class DeployerRecoveryLogTests {
- private PathReference deployArea = new PathReference("target/deployArea");
+ private PathReference deployArea = new PathReference("build/deployArea");
@Before
public void cleanup() {
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/hotenabler/HotDeployerTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/hotenabler/HotDeployerTests.java
index 37fb11ca..608b5b02 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/hotenabler/HotDeployerTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/hotenabler/HotDeployerTests.java
@@ -37,7 +37,7 @@ import org.osgi.service.event.Event;
*/
public class HotDeployerTests {
- private static final PathReference PICKUP_DIR = new PathReference("target/pickup");
+ private static final PathReference PICKUP_DIR = new PathReference("build/pickup");
private ApplicationDeployer deployer;
@@ -79,7 +79,7 @@ public class HotDeployerTests {
replay(this.deployer);
DeployerConfiguration deployerConfiguration = createMock(DeployerConfiguration.class);
- expect(deployerConfiguration.getDeploymentPickupDirectory()).andReturn(new PathReference("target/pickup"));
+ expect(deployerConfiguration.getDeploymentPickupDirectory()).andReturn(new PathReference("build/pickup"));
expect(deployerConfiguration.getScanIntervalMillis()).andReturn(1000);
replay(deployerConfiguration);
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModelTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModelTests.java
index 9be7e2e4..18290ed6 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModelTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModelTests.java
@@ -121,7 +121,7 @@ public class StandardRuntimeArtifactModelTests {
assertNull(this.standardRuntimeArtifactModel.get(this.deploymentIdentity));
// Now deploy a file, delete it, and then get the deployed artifact.
- File dir = new File("target/StandardRuntimeArtifactModelTest.dir/");
+ File dir = new File("build/StandardRuntimeArtifactModelTest.dir/");
dir.mkdir();
URI uri = dir.toURI();
this.standardRuntimeArtifactModel.add(uri, this.stubInstallArtifact);
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/AbstractInstallArtifactTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/AbstractInstallArtifactTests.java
index 5cb946d9..f2563e2e 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/AbstractInstallArtifactTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/AbstractInstallArtifactTests.java
@@ -22,8 +22,11 @@ import java.util.Set;
import org.eclipse.virgo.kernel.artifact.fs.ArtifactFS;
import org.eclipse.virgo.nano.core.AbortableSignal;
import org.eclipse.virgo.nano.deployer.api.core.DeploymentException;
+import org.eclipse.virgo.util.common.DirectedAcyclicGraph;
+import org.eclipse.virgo.util.common.ThreadSafeDirectedAcyclicGraph;
import org.eclipse.virgo.kernel.install.artifact.ArtifactIdentity;
import org.eclipse.virgo.kernel.install.artifact.ArtifactStorage;
+import org.eclipse.virgo.kernel.install.artifact.InstallArtifact;
import org.eclipse.virgo.kernel.install.artifact.InstallArtifact.State;
import org.eclipse.virgo.medic.test.eventlog.MockEventLogger;
import org.junit.After;
@@ -48,7 +51,9 @@ public class AbstractInstallArtifactTests {
@Before
public void setUp() throws Exception {
this.artifactStateMonitor = new StubArtifactStateMonitor();
+ DirectedAcyclicGraph<InstallArtifact> dag = new ThreadSafeDirectedAcyclicGraph<InstallArtifact>();
this.installArtifact = new StubInstallArtifact(artifactStateMonitor);
+ this.installArtifact.setGraph(dag.createRootNode(installArtifact));
}
@After
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/FileMovingArtifactStoreTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/FileMovingArtifactStoreTests.java
index 4213920f..55ee1372 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/FileMovingArtifactStoreTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/FileMovingArtifactStoreTests.java
@@ -23,7 +23,7 @@ import org.junit.Test;
public class FileMovingArtifactStoreTests {
- private static final String TEST_PATH = "target/fileMovingArtifactStoreTests/";
+ private static final String TEST_PATH = "build/fileMovingArtifactStoreTests/";
private static final String TEST_FILENAME = "some.jar";
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/GenerationalArtifactStoreTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/GenerationalArtifactStoreTests.java
index 75de67a1..aae8f7f9 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/GenerationalArtifactStoreTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/GenerationalArtifactStoreTests.java
@@ -23,7 +23,7 @@ import org.junit.Test;
public class GenerationalArtifactStoreTests {
- private static final String TEST_PATH = "target/generationalArtifactStoreTests/";
+ private static final String TEST_PATH = "build/generationalArtifactStoreTests/";
private static final String TEST_FILENAME = "some.jar";
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardInstallArtifactGraphInclosureTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardInstallArtifactGraphInclosureTests.java
index 1f10d006..05ce729a 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardInstallArtifactGraphInclosureTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/artifact/internal/StandardInstallArtifactGraphInclosureTests.java
@@ -85,7 +85,7 @@ public class StandardInstallArtifactGraphInclosureTests {
private RepositoryAwareArtifactDescriptor artifactDescriptor;
private final ArtifactStorageFactory artifactStorageFactory = new StandardArtifactStorageFactory(
- new PathReference("target/work/deployer.staging"), new StandardArtifactFSFactory(), new MockEventLogger(), "true");
+ new PathReference("build/work/deployer.staging"), new StandardArtifactFSFactory(), new MockEventLogger(), "true");
private Set<ArtifactBridge> testArtifactBridges = new HashSet<ArtifactBridge>();
diff --git a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/pipeline/stage/transform/internal/SyntheticContextBundleCreatingTransformerTests.java b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/pipeline/stage/transform/internal/SyntheticContextBundleCreatingTransformerTests.java
index 0116efa7..76f676b4 100644
--- a/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/pipeline/stage/transform/internal/SyntheticContextBundleCreatingTransformerTests.java
+++ b/org.eclipse.virgo.kernel.deployer/src/test/java/org/eclipse/virgo/kernel/install/pipeline/stage/transform/internal/SyntheticContextBundleCreatingTransformerTests.java
@@ -64,7 +64,7 @@ public final class SyntheticContextBundleCreatingTransformerTests {
private final InstallEnvironment installEnvironment = createMock(InstallEnvironment.class);
- private final ArtifactStorageFactory artifactStorageFactory = new StandardArtifactStorageFactory(new PathReference("target/work"),
+ private final ArtifactStorageFactory artifactStorageFactory = new StandardArtifactStorageFactory(new PathReference("build/work"),
new StandardArtifactFSFactory(), new MockEventLogger(), "true");
private final Transformer transformer = new SyntheticContextBundleCreatingTransformer(this.installArtifactGraphFactory,
@@ -75,7 +75,7 @@ public final class SyntheticContextBundleCreatingTransformerTests {
@Before
public void createGraph() {
this.dag = new ThreadSafeDirectedAcyclicGraph<InstallArtifact>();
- new PathReference("target/work/staging/plan-name-1").delete(true);
+ new PathReference("build/work/staging/plan-name-1").delete(true);
}
@SuppressWarnings("unchecked")
@@ -84,7 +84,7 @@ public final class SyntheticContextBundleCreatingTransformerTests {
GraphNode<InstallArtifact> planInstallGraph = createMockPlan(true, new Version(1, 0, 0), "plan-name", "bundle1", "bundle2", "bundle3");
InstallArtifact syntheticContextInstallArtifact = createMock(InstallArtifact.class);
- File syntheticBundleDir = new File("target/work/s/plan-name-1/0/0/plan-name-1-synthetic.context.jar").getAbsoluteFile();
+ File syntheticBundleDir = new File("build/work/s/plan-name-1/0/0/plan-name-1-synthetic.context.jar").getAbsoluteFile();
expect(
this.installArtifactGraphFactory.constructInstallArtifactGraph(eq(new ArtifactIdentity("bundle", "plan-name-1-synthetic.context",
new Version(1, 0, 0), ScopeNameFactory.createScopeName("plan-name", new Version(1, 0, 0)))), isA(ArtifactStorage.class),
@@ -110,7 +110,7 @@ public final class SyntheticContextBundleCreatingTransformerTests {
InstallArtifact syntheticContextInstallArtifact = createMock(InstallArtifact.class);
- File syntheticBundleDir = new File("target/work/s/plan-name-1/0/0/plan-name-1-synthetic.context.jar").getAbsoluteFile();
+ File syntheticBundleDir = new File("build/work/s/plan-name-1/0/0/plan-name-1-synthetic.context.jar").getAbsoluteFile();
expect(
this.installArtifactGraphFactory.constructInstallArtifactGraph(eq(new ArtifactIdentity("bundle", "plan-name-1-synthetic.context",
new Version(1, 0, 0), ScopeNameFactory.createScopeName("plan-name", new Version(1, 0, 0)))), isA(ArtifactStorage.class),
@@ -137,7 +137,7 @@ public final class SyntheticContextBundleCreatingTransformerTests {
InstallArtifact syntheticContextInstallArtifact = createMock(InstallArtifact.class);
File syntheticBundleDir = new File(
- "target/work/s/nested-plan-1/0/0/nested-plan-1-synthetic.context.jar").getAbsoluteFile();
+ "build/work/s/nested-plan-1/0/0/nested-plan-1-synthetic.context.jar").getAbsoluteFile();
expect(
this.installArtifactGraphFactory.constructInstallArtifactGraph(eq(new ArtifactIdentity("bundle", "nested-plan-1-synthetic.context",
new Version(1, 0, 0), ScopeNameFactory.createScopeName("nested-plan", new Version(1, 0, 0)))), isA(ArtifactStorage.class),
diff --git a/org.eclipse.virgo.kernel.deployer/template.mf b/org.eclipse.virgo.kernel.deployer/template.mf
index 6eaf2566..0ce3a212 100644
--- a/org.eclipse.virgo.kernel.deployer/template.mf
+++ b/org.eclipse.virgo.kernel.deployer/template.mf
@@ -5,19 +5,20 @@ Bundle-SymbolicName: org.eclipse.virgo.kernel.deployer
Bundle-Version: ${version}
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.repository.*;version="${org.eclipse.virgo.repository:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
- org.eclipse.gemini.blueprint.*;version="${org.eclipse.gemini.blueprint:[=.=.=, +1]}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1]}",
org.osgi.framework.*;version="0",
org.eclipse.osgi.*;version="0",
org.osgi.service.*;version="0",
+ org.osgi.service.cm.*;version="0",
org.osgi.util.tracker.*;version="0",
- org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
+ org.eclipse.equinox.region.*;version="${equinoxRegionVersion:[=.=.=, =.+1)}",
javax.management.*;version="0",
javax.xml.*;version="0",
org.xml.*;version="0",
diff --git a/org.eclipse.virgo.kernel.dmfragment/template.mf b/org.eclipse.virgo.kernel.dmfragment/template.mf
index e43b108b..bf089dd4 100644
--- a/org.eclipse.virgo.kernel.dmfragment/template.mf
+++ b/org.eclipse.virgo.kernel.dmfragment/template.mf
@@ -9,12 +9,12 @@ Import-Package:
org.eclipse.virgo.nano.shim.serviceability;version="${version:[=.=.=, =.+1)}"
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
javax.management.*;version="0",
org.osgi.framework.*;version="0",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}"
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}"
Excluded-Imports:
org.eclipse.gemini.blueprint.*
Excluded-Exports:
diff --git a/org.eclipse.virgo.kernel.equinox.extensions/src/test/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/PluggableClassLoadingHookTests.java b/org.eclipse.virgo.kernel.equinox.extensions/src/test/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/PluggableClassLoadingHookTests.java
index b900bf43..76e7b5ef 100644
--- a/org.eclipse.virgo.kernel.equinox.extensions/src/test/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/PluggableClassLoadingHookTests.java
+++ b/org.eclipse.virgo.kernel.equinox.extensions/src/test/java/org/eclipse/virgo/kernel/equinox/extensions/hooks/PluggableClassLoadingHookTests.java
@@ -47,8 +47,8 @@ public class PluggableClassLoadingHookTests {
@Before
public void setUp() throws BundleException {
EquinoxLauncherConfiguration config = new EquinoxLauncherConfiguration();
- config.setConfigPath(new File("target/config").toURI());
- config.setInstallPath(new File("target/install").toURI());
+ config.setConfigPath(new File("build/config").toURI());
+ config.setInstallPath(new File("build/install").toURI());
this.osgi = ExtendedEquinoxLauncher.launch(config);
this.context = osgi.getBundleContext();
diff --git a/org.eclipse.virgo.kernel.model/template.mf b/org.eclipse.virgo.kernel.model/template.mf
index 58e48eb0..a3543dca 100644
--- a/org.eclipse.virgo.kernel.model/template.mf
+++ b/org.eclipse.virgo.kernel.model/template.mf
@@ -5,17 +5,17 @@ Bundle-SymbolicName: org.eclipse.virgo.kernel.model
Bundle-Version: ${version}
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
javax.annotation.*;version="0",
javax.management.*;version="0",
org.osgi.framework.*;version="0",
org.osgi.service.cm.*;version="0",
org.osgi.util.tracker.*;version="0",
- org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}"
+ org.eclipse.equinox.region.*;version="${equinoxRegionVersion:[=.=.=, =.+1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}"
Excluded-Exports:
*.internal.*
diff --git a/org.eclipse.virgo.kernel.osgi/template.mf b/org.eclipse.virgo.kernel.osgi/template.mf
index a6e57776..0f3cabac 100644
--- a/org.eclipse.virgo.kernel.osgi/template.mf
+++ b/org.eclipse.virgo.kernel.osgi/template.mf
@@ -10,16 +10,16 @@ Excluded-Imports:
org.eclipse.virgo.repository.internal
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.eclipse.virgo.repository.*;version="${org.eclipse.virgo.repository:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
org.eclipse.osgi.*;version="0",
- org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
+ org.eclipse.equinox.region.*;version="${equinoxRegionVersion:[=.=.=, =.+1)}",
org.osgi.framework.*;version="0",
org.osgi.service.*;version="0",
org.osgi.util.*;version="0",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
javax.management;version="0"
diff --git a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/repository/internal/RepositoryFactoryBeanTests.java b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/repository/internal/RepositoryFactoryBeanTests.java
index ffa7ecb9..6b985687 100644
--- a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/repository/internal/RepositoryFactoryBeanTests.java
+++ b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/repository/internal/RepositoryFactoryBeanTests.java
@@ -46,7 +46,7 @@ public class RepositoryFactoryBeanTests {
mockEventLogger.reinitialise();
Properties properties = new Properties();
RepositoryFactory factory = createMock(RepositoryFactory.class);
- File work = new File("target");
+ File work = new File("build");
RepositoryFactoryBean bean = new RepositoryFactoryBean(properties, mockEventLogger, factory, work, Collections.<ArtifactBridge>emptySet(), null);
Repository r = bean.getObject();
@@ -57,12 +57,12 @@ public class RepositoryFactoryBeanTests {
@SuppressWarnings("unchecked")
@Test
public void testCreate() throws Exception {
- File work = new File("target");
+ File work = new File("build");
mockEventLogger.reinitialise();
Properties properties = new Properties();
properties.put("bundles.type", "external");
- properties.put("bundles.searchPattern", "target/*.jar");
+ properties.put("bundles.searchPattern", "build/*.jar");
properties.put("chain", "bundles");
RepositoryFactory factory = createMock(RepositoryFactory.class);
@@ -81,7 +81,7 @@ public class RepositoryFactoryBeanTests {
mockEventLogger.reinitialise();
Properties properties = new Properties();
RepositoryFactory factory = createMock(RepositoryFactory.class);
- File work = new File("target");
+ File work = new File("build");
RepositoryFactoryBean bean = new RepositoryFactoryBean(properties, mockEventLogger, factory, work, Collections.<ArtifactBridge>emptySet(), null);
assertTrue(bean.isSingleton());
diff --git a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/StandardWorkAreaTests.java b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/StandardWorkAreaTests.java
index 251b1ad9..e6f5bf42 100644
--- a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/StandardWorkAreaTests.java
+++ b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/StandardWorkAreaTests.java
@@ -37,8 +37,8 @@ public class StandardWorkAreaTests {
@Before
public void before() {
- FileSystemUtils.deleteRecursively(new File("./target/work", WORK_DIR_NAME));
- FileSystemUtils.deleteRecursively(new File("./target/work", KERNEL_WORK_DIR_NAME));
+ FileSystemUtils.deleteRecursively(new File("./build/work", WORK_DIR_NAME));
+ FileSystemUtils.deleteRecursively(new File("./build/work", KERNEL_WORK_DIR_NAME));
}
@Test
@@ -46,27 +46,27 @@ public class StandardWorkAreaTests {
StubBundle bundle = new StubBundle(WORK_DIR_NAME, Version.emptyVersion);
- StandardWorkArea manager = new StandardWorkArea(new File("./target/work"), bundle);
+ StandardWorkArea manager = new StandardWorkArea(new File("./build/work"), bundle);
PathReference workDir = manager.getWorkDirectory();
assertNotNull(workDir);
assertTrue("work dir does not exist", workDir.exists());
assertTrue(workDir.isDirectory());
- assertTrue(new File("./target/work", WORK_DIR_NAME + "_" + Version.emptyVersion).exists());
+ assertTrue(new File("./build/work", WORK_DIR_NAME + "_" + Version.emptyVersion).exists());
}
@Test
public void kernelWorkDirectory() {
StubBundle bundle = new StubBundle(KERNEL_BSN, Version.emptyVersion);
- StandardWorkArea manager = new StandardWorkArea(new File("./target/work"), bundle);
+ StandardWorkArea manager = new StandardWorkArea(new File("./build/work"), bundle);
PathReference workDir = manager.getWorkDirectory();
assertNotNull(workDir);
assertTrue("work dir does not exist", workDir.exists());
assertTrue(workDir.isDirectory());
- assertTrue(new File("./target/work", KERNEL_WORK_DIR_NAME).exists());
+ assertTrue(new File("./build/work", KERNEL_WORK_DIR_NAME).exists());
}
}
diff --git a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/WorkAreaServiceFactoryTests.java b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/WorkAreaServiceFactoryTests.java
index 8ee94951..fafb7ff2 100644
--- a/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/WorkAreaServiceFactoryTests.java
+++ b/org.eclipse.virgo.kernel.services/src/test/java/org/eclipse/virgo/kernel/services/work/WorkAreaServiceFactoryTests.java
@@ -29,7 +29,7 @@ public class WorkAreaServiceFactoryTests {
@Test
public void testCreate() {
- File work = new File("target");
+ File work = new File("build");
WorkAreaServiceFactory factory = new WorkAreaServiceFactory(work);
StubBundle bundle = new StubBundle("foo", new Version("1.0.0"));
diff --git a/org.eclipse.virgo.kernel.services/template.mf b/org.eclipse.virgo.kernel.services/template.mf
index 4cca3ea8..6588fe53 100644
--- a/org.eclipse.virgo.kernel.services/template.mf
+++ b/org.eclipse.virgo.kernel.services/template.mf
@@ -7,15 +7,15 @@ Excluded-Exports:
*.internal.*
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.repository.*;version="${org.eclipse.virgo.repository:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
org.osgi.framework.*;version="0",
org.osgi.service.cm.*;version="0",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
javax.management.*;version="0",
javax.xml.*;version="0",
org.xml.*;version="0",
diff --git a/org.eclipse.virgo.kernel.stubs/template.mf b/org.eclipse.virgo.kernel.stubs/template.mf
index 4bcb0096..51bcb005 100644
--- a/org.eclipse.virgo.kernel.stubs/template.mf
+++ b/org.eclipse.virgo.kernel.stubs/template.mf
@@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.virgo.kernel.stubs
Bundle-Version: ${version}
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
org.osgi.framework.*;version="0"
diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/ffdc/test/FFDCServiceAspectTests.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/ffdc/test/FFDCServiceAspectTests.java
index b2789ed6..21903465 100644
--- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/ffdc/test/FFDCServiceAspectTests.java
+++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/ffdc/test/FFDCServiceAspectTests.java
@@ -39,7 +39,7 @@ public class FFDCServiceAspectTests extends AbstractKernelIntegrationTest {
}
private int dumpFileCount() {
- File dumpDir = new File("target/dumpfiles");
+ File dumpDir = new File("build/dumpfiles");
String[] list = dumpDir.list();
return (list == null ? 0 : list.length);
}
diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java
index 67e85fca..64942e1d 100644
--- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java
+++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java
@@ -60,7 +60,7 @@ public class QuasiFrameworkStateDumpIntegrationTests extends AbstractKernelInteg
Assert.assertNotNull(this.quasiFrameworkFactory);
this.quasiFramework = this.quasiFrameworkFactory.create();
Assert.assertNotNull(this.quasiFramework);
- this.dumpDir = new File("target/serviceability/dump/");
+ this.dumpDir = new File("build/serviceability/dump/");
if(this.dumpDir.exists()){
FileSystemUtils.deleteRecursively(this.dumpDir);
}
diff --git a/org.eclipse.virgo.kernel.test/template.mf b/org.eclipse.virgo.kernel.test/template.mf
index 88e0209b..f9aff5d4 100644
--- a/org.eclipse.virgo.kernel.test/template.mf
+++ b/org.eclipse.virgo.kernel.test/template.mf
@@ -5,15 +5,15 @@ Bundle-SymbolicName: org.eclipse.virgo.kernel.test
Bundle-Version: ${version}
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, +1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, +1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, +1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, +1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, +1)}",
javax.management.*;version="0",
org.easymock.*;version="${org.easymock:[=.=.=, +1)}",
org.junit.*;version="${org.junit:[=.=.=, +1)}",
org.eclipse.osgi.*;version="0",
org.osgi.*;version="0",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
- org.eclipse.gemini.blueprint.*;version="${org.eclipse.gemini.blueprint:[=.=.=, +1)}"
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.eclipse.gemini.blueprint.*;version="${geminiBlueprintVersion:[=.=.=, +1)}"
Excluded-Imports:
subsystem.installation,
com.springsource,
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/AbstractOsgiFrameworkLaunchingTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/AbstractOsgiFrameworkLaunchingTests.java
index 0dbe6964..87dfc1ce 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/AbstractOsgiFrameworkLaunchingTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/AbstractOsgiFrameworkLaunchingTests.java
@@ -88,10 +88,10 @@ public abstract class AbstractOsgiFrameworkLaunchingTests {
@Before
public void setUp() throws Exception {
- final File workDir = new File("target/work");
+ final File workDir = new File("build/work");
if (workDir.exists()) {
- assertTrue(FileSystemUtils.deleteRecursively(new File("target/work")));
+ assertTrue(FileSystemUtils.deleteRecursively(new File("build/work")));
}
// Uncomment this line to enable Equinox debugging
@@ -101,7 +101,7 @@ public abstract class AbstractOsgiFrameworkLaunchingTests {
// FrameworkProperties.setProperty("osgi.console", "2401");
EquinoxLauncherConfiguration launcherConfiguration = new EquinoxLauncherConfiguration();
launcherConfiguration.setClean(true);
- URI targetURI = new File("./target").toURI();
+ URI targetURI = new File("./build").toURI();
launcherConfiguration.setConfigPath(targetURI);
launcherConfiguration.setInstallPath(targetURI);
@@ -144,7 +144,7 @@ public abstract class AbstractOsgiFrameworkLaunchingTests {
artifactBridges.add(new BundleBridge(new StubHashGenerator()));
artifactBridges.add(new LibraryBridge(new StubHashGenerator()));
- RepositoryFactoryBean bean = new RepositoryFactoryBean(repositoryProperties, mockEventLogger, repositoryFactory, new File("target/work"),
+ RepositoryFactoryBean bean = new RepositoryFactoryBean(repositoryProperties, mockEventLogger, repositoryFactory, new File("build/work"),
artifactBridges, null);
repository = bean.getObject();
@@ -172,7 +172,7 @@ public abstract class AbstractOsgiFrameworkLaunchingTests {
@Override
public PathReference getWorkDirectory() {
- return new PathReference(new File("target/work"));
+ return new PathReference(new File("build/work"));
}
};
DumpExtractor dumpExtractor = new StandardDumpExtractor(workArea);
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/BundleUpdateTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/BundleUpdateTests.java
index 83cf0310..2defaf15 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/BundleUpdateTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/BundleUpdateTests.java
@@ -51,14 +51,14 @@ public class BundleUpdateTests extends AbstractOsgiFrameworkLaunchingTests {
@Ignore("See DMS-2886")
public void testUpdate() throws Exception {
PathReference bBeforeSrc = new PathReference("src/test/resources/but/but.B.before.jar");
- PathReference b = new PathReference("target/but.B.jar");
+ PathReference b = new PathReference("build/but.B.jar");
b.delete();
bBeforeSrc.copy(b);
Bundle bBundle = this.framework.getBundleContext().installBundle(b.toFile().toURI().toString());
assertNotNull(bBundle);
PathReference cSrc = new PathReference("src/test/resources/but/but.C.jar");
- PathReference c = new PathReference("target/but.C.jar");
+ PathReference c = new PathReference("build/but.C.jar");
c.delete();
cSrc.copy(c);
Bundle cBundle = this.framework.getBundleContext().installBundle(c.toFile().toURI().toString());
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
index 6473e0c1..83c58fdc 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/equinox/EquinoxOsgiFrameworkTests.java
@@ -96,7 +96,7 @@ public class EquinoxOsgiFrameworkTests extends AbstractOsgiFrameworkLaunchingTes
* @throws BundleException
*/
private Bundle installSpringCore(EquinoxOsgiFramework osgi) throws BundleException {
- osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar").getAbsolutePath());
- return osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.springframework/org.springframework.core/2.5.6.SEC01/org.springframework.core-2.5.6.SEC01.jar").getAbsolutePath());
+ osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home") + "/.gradle/caches/modules-2/files-2.1/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/7657caf2c78e1d79c74d36f2ae128a115f7cc180/com.springsource.org.apache.commons.logging-1.1.1.jar").getAbsolutePath());
+ return osgi.getBundleContext().installBundle("file:///" + new File(System.getProperty("user.home") + "/.gradle/caches/modules-2/files-2.1/org.springframework/org.springframework.core/3.1.0.RELEASE/3a18c725dd321e457cfb48547d40c2862216bb3b/org.springframework.core-3.1.0.RELEASE.jar").getAbsolutePath());
}
}
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
index c6cf8200..e0e44bd3 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
+++ b/org.eclipse.virgo.kernel.userregion/src/test/java/org/eclipse/virgo/kernel/userregion/internal/importexpansion/ImportExpansionHandlerTests.java
@@ -73,8 +73,8 @@ public class ImportExpansionHandlerTests {
BundleBridge bundleBridge = new BundleBridge(new StubHashGenerator());
LibraryBridge libraryBridge = new LibraryBridge(new StubHashGenerator());
- this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File(System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.springframework/org.springframework.core/2.5.6.SEC01/org.springframework.core-2.5.6.SEC01.jar")));
- this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File(System.getProperty("user.home") + "/virgo-build-cache/ivy-cache/repository/org.springframework/org.springframework.beans/2.5.6.SEC01/org.springframework.beans-2.5.6.SEC01.jar")));
+ this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File(System.getProperty("user.home") + "/.gradle/caches/modules-2/files-2.1/org.springframework/org.springframework.core/3.1.0.RELEASE/3a18c725dd321e457cfb48547d40c2862216bb3b/org.springframework.core-3.1.0.RELEASE.jar")));
+ this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File(System.getProperty("user.home") + "/.gradle/caches/modules-2/files-2.1/org.springframework/org.springframework.beans/3.1.0.RELEASE/d12bb11cc2469cca2d8ba33d86d188733544d7e0/org.springframework.beans-3.1.0.RELEASE.jar")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentOne")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentTwo")));
this.repository.addArtifactDescriptor(bundleBridge.generateArtifactDescriptor(new File("src/test/resources/silht/bundles/fragmentThree")));
@@ -94,7 +94,7 @@ public class ImportExpansionHandlerTests {
ImportedBundle bundleImport = createAndStoreMock(ImportedBundle.class, mocks);
expect(bundleImport.getBundleSymbolicName()).andReturn("org.springframework.core").atLeastOnce();
- expect(bundleImport.getVersion()).andReturn(new VersionRange("[2.5,3.0)")).atLeastOnce();
+ expect(bundleImport.getVersion()).andReturn(new VersionRange("[3.1,4)")).atLeastOnce();
expect(bundleImport.isApplicationImportScope()).andReturn(false).atLeastOnce();
expect(bundleImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
@@ -108,13 +108,13 @@ public class ImportExpansionHandlerTests {
verifyMocks(mocks);
- assertEquals(19, bundleManifest.getImportPackage().getImportedPackages().size());
+ assertEquals(20, bundleManifest.getImportPackage().getImportedPackages().size());
List<ImportedPackage> packageImports = bundleManifest.getImportPackage().getImportedPackages();
for (ImportedPackage packageImport : packageImports) {
Map<String, String> attributes = packageImport.getAttributes();
assertTrue("org.springframework.core".equals(attributes.get("bundle-symbolic-name")));
- assertEquals(new VersionRange("[2.5.6.SEC01,2.5.6.SEC01]"), new VersionRange(attributes.get("bundle-version")));
+ assertEquals(new VersionRange("[3.1.0.RELEASE,3.1.0.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
}
}
@@ -126,7 +126,7 @@ public class ImportExpansionHandlerTests {
ImportedLibrary libraryImport = createAndStoreMock(ImportedLibrary.class, mocks);
expect(libraryImport.getLibrarySymbolicName()).andReturn("org.springframework").atLeastOnce();
- expect(libraryImport.getVersion()).andReturn(new VersionRange("[2.5,3.0)")).atLeastOnce();
+ expect(libraryImport.getVersion()).andReturn(new VersionRange("[3.1,4)")).atLeastOnce();
expect(libraryImport.getResolution()).andReturn(Resolution.MANDATORY).anyTimes();
ImportExpansionHandler handler = new ImportExpansionHandler(repository, packagesExportedBySystemBundle, new MockEventLogger());
@@ -149,7 +149,7 @@ public class ImportExpansionHandlerTests {
} else {
assertTrue("org.springframework.core".equals(attributes.get("bundle-symbolic-name")));
}
- assertEquals(new VersionRange("[2.5.6.SEC01,2.5.6.SEC01]"), new VersionRange(attributes.get("bundle-version")));
+ assertEquals(new VersionRange("[3.1.0.RELEASE,3.1.0.RELEASE]"), new VersionRange(attributes.get("bundle-version")));
}
}
@@ -447,7 +447,7 @@ public class ImportExpansionHandlerTests {
ImportedBundle bundleImport = createAndStoreMock(ImportedBundle.class, mocks);
expect(bundleImport.getBundleSymbolicName()).andReturn("org.springframework.core").atLeastOnce();
- expect(bundleImport.getVersion()).andReturn(new VersionRange("[2.5,3.0)")).atLeastOnce();
+ expect(bundleImport.getVersion()).andReturn(new VersionRange("[3.1,4)")).atLeastOnce();
expect(bundleImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
expect(bundleImport.isApplicationImportScope()).andReturn(false);
@@ -461,7 +461,7 @@ public class ImportExpansionHandlerTests {
verifyMocks(mocks);
- assertEquals(19, bundleManifest.getImportPackage().getImportedPackages().size());
+ assertEquals(20, bundleManifest.getImportPackage().getImportedPackages().size());
}
@Test
@@ -470,7 +470,7 @@ public class ImportExpansionHandlerTests {
ImportedLibrary libraryImport = createAndStoreMock(ImportedLibrary.class, mocks);
expect(libraryImport.getLibrarySymbolicName()).andReturn("org.springframework").atLeastOnce();
- expect(libraryImport.getVersion()).andReturn(new VersionRange("[2.5,3.0)")).atLeastOnce();
+ expect(libraryImport.getVersion()).andReturn(new VersionRange("[3.1,4)")).atLeastOnce();
ImportExpansionHandler handler = new ImportExpansionHandler(repository, packagesExportedBySystemBundle, new MockEventLogger());
@@ -521,13 +521,13 @@ public class ImportExpansionHandlerTests {
ImportedBundle bundleImport = createAndStoreMock(ImportedBundle.class, mocks);
expect(bundleImport.getBundleSymbolicName()).andReturn("org.springframework.core").atLeastOnce();
- expect(bundleImport.getVersion()).andReturn(new VersionRange("[2.5,3.0)")).atLeastOnce();
+ expect(bundleImport.getVersion()).andReturn(new VersionRange("[3.1,4)")).atLeastOnce();
expect(bundleImport.isApplicationImportScope()).andReturn(false).atLeastOnce();
expect(bundleImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
ImportedLibrary libraryImport = createAndStoreMock(ImportedLibrary.class, mocks);
expect(libraryImport.getLibrarySymbolicName()).andReturn("org.springframework").atLeastOnce();
- expect(libraryImport.getVersion()).andReturn(new VersionRange("[2.5,3.0)")).atLeastOnce();
+ expect(libraryImport.getVersion()).andReturn(new VersionRange("[3.1,4)")).atLeastOnce();
expect(libraryImport.getResolution()).andReturn(Resolution.MANDATORY).atLeastOnce();
ImportExpansionHandler handler = new ImportExpansionHandler(repository, packagesExportedBySystemBundle, new MockEventLogger());
diff --git a/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd b/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
index 2803caf7..3e859c7f 100644
--- a/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
+++ b/org.eclipse.virgo.kernel.userregion/src/test/resources/silht/libraries/spring.libd
@@ -1,5 +1,5 @@
Library-SymbolicName: org.springframework
-Library-Version: 2.5.1
-Import-Bundle: org.springframework.core;version="[2.5.6.SEC01,2.5.6.SEC01]",
- org.springframework.beans;version="[2.5.6.SEC01,2.5.6.SEC01]"
+Library-Version: 3.1.0
+Import-Bundle: org.springframework.core;version="[3.1.0.RELEASE,3.1.0.RELEASE]",
+ org.springframework.beans;version="[3.1.0.RELEASE,3.1.0.RELEASE]"
\ No newline at end of file
diff --git a/org.eclipse.virgo.kernel.userregion/template.mf b/org.eclipse.virgo.kernel.userregion/template.mf
index 05b7a96d..eb3dec00 100644
--- a/org.eclipse.virgo.kernel.userregion/template.mf
+++ b/org.eclipse.virgo.kernel.userregion/template.mf
@@ -10,16 +10,16 @@ Excluded-Imports:
org.eclipse.virgo.kernel.userregion.internal.*,
org.eclipse.virgo.repository.internal
Import-Template:
- org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
+ org.eclipse.equinox.region.*;version="${equinoxRegionVersion:[=.=.=, =.+1)}",
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.repository.*;version="${org.eclipse.virgo.repository:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
- org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.eclipse.equinox.region.*;version="${equinoxRegionVersion:[=.=.=, =.+1)}",
org.eclipse.osgi.*;version="0",
org.osgi.framework.*;version="0",
org.osgi.service.*;version="0",
diff --git a/org.eclipse.virgo.kernel.userregionfactory/template.mf b/org.eclipse.virgo.kernel.userregionfactory/template.mf
index 8e8c0bfb..b1e8da07 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/template.mf
+++ b/org.eclipse.virgo.kernel.userregionfactory/template.mf
@@ -6,14 +6,14 @@ Service-Component: OSGI-INF/userregionfactory.xml
Bundle-Version: ${version}
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.osgi.framework.*;version="0",
org.eclipse.osgi.service.resolver.*;version="0",
org.osgi.framework.*;version="0",
org.osgi.service.*;version="0",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}"
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.equinox.region.*;version="${equinoxRegionVersion:[=.=.=, =.+1)}"
Import-Package: org.aspectj.lang;version="0"
Excluded-Imports: org.easymock,
org.eclipse.virgo.test.*
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/UploadServletTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/UploadServletTests.java
index fa59489a..524fa092 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/UploadServletTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/UploadServletTests.java
@@ -34,7 +34,7 @@ public class UploadServletTests {
public void testDoUploadFail() throws Exception {
UploadServlet uploadServlet = new UploadServlet();
FileItem fileItem = new DiskFileItem("foo", "json/application", false, "src/test/resources/test.upload", 500, new File("/target"));
- File stagingDir = new File("target");
+ File stagingDir = new File("build");
fileItem.getOutputStream();
uploadServlet.doUpload(fileItem, stagingDir);
}
diff --git a/org.eclipse.virgo.management.console/template.mf b/org.eclipse.virgo.management.console/template.mf
index f7f5c624..f9d23eff 100644
--- a/org.eclipse.virgo.management.console/template.mf
+++ b/org.eclipse.virgo.management.console/template.mf
@@ -7,10 +7,10 @@ Bundle-ClassPath: WEB-INF/classes
Web-ContextPath: /admin
Bundle-Activator: org.eclipse.virgo.management.console.Activator
Import-Template:
- javax.servlet.*;version="${javax.servlet:[-1.6.=,=.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, +1)}",
- org.jolokia.osgi.servlet;version="${org.jolokia.osgi:[=.=,+1.=)}",
- org.slf4j;version="${org.slf4j.api:[=.=.=,+1)}",
+ javax.servlet.*;version="${javaxServletVersion:[-1.6.=,=.+1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, +1)}",
+ org.jolokia.osgi.servlet;version="${jolokiaVersion:[=.=,+1.=)}",
+ org.slf4j;version="${slf4jVersion:[=.=.=,+1)}",
org.apache.commons.fileupload.*;version="0",
org.eclipse.osgi.internal.signedcontent;version="0",
org.osgi.framework.*;version="0",
diff --git a/org.eclipse.virgo.management.fragment/template.mf b/org.eclipse.virgo.management.fragment/template.mf
index 28fdd20a..86241942 100644
--- a/org.eclipse.virgo.management.fragment/template.mf
+++ b/org.eclipse.virgo.management.fragment/template.mf
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Virgo Management Fragment
-Fragment-Host: org.eclipse.gemini.management;bundle-version="${org.eclipse.gemini.management:[=.=.=, =.+1)}"
+Fragment-Host: org.eclipse.gemini.management;bundle-version="${geminiManagementVersion:[=.=.=, =.+1)}"
Bundle-SymbolicName: org.eclipse.virgo.management.fragment
Bundle-Version: ${version}
GeminiManagement-ObjectNameTranslator: org.eclipse.virgo.management.fragment.VirgoObjectNameTranslator
Import-Package:
- org.eclipse.equinox.region;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
+ org.eclipse.equinox.region;version="${equinoxRegionVersion:[=.=.=, =.+1)}",
javax.management;version="0",
org.osgi.framework;version="0"
Excluded-Imports: org.eclipse.gemini.management
diff --git a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/InstallCompleterTests.java b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/InstallCompleterTests.java
index a5416630..b121011e 100644
--- a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/InstallCompleterTests.java
+++ b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/InstallCompleterTests.java
@@ -27,7 +27,7 @@ public class InstallCompleterTests {
private static final String FILE_PREFIX = "file:";
- private static final File base = new File("target" + File.separatorChar + "install-completer" + File.separatorChar);
+ private static final File base = new File("build" + File.separatorChar + "install-completer" + File.separatorChar);
private static final String ALPHA = FILE_PREFIX + new File(base, "alpha ").getPath();
diff --git a/org.eclipse.virgo.shell.command/template.mf b/org.eclipse.virgo.shell.command/template.mf
index 9e06c9c2..33487096 100644
--- a/org.eclipse.virgo.shell.command/template.mf
+++ b/org.eclipse.virgo.shell.command/template.mf
@@ -5,13 +5,13 @@ Bundle-SymbolicName: org.eclipse.virgo.shell.command
Bundle-Version: ${version}
Import-Template:
org.eclipse.virgo.kernel.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.nano.*;version="${org.eclipse.virgo.nano:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.eclipse.virgo.repository.*;version="${org.eclipse.virgo.repository:[=.=.=, =.+1)}",
- org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
+ org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.repository.*;version="${version:[=.=.=, =.+1)}",
+ org.springframework.*;version="${springframeworkVersion:[2.5.6, +1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
javax.crypto.*;version="0",
javax.net.*;version="0",
javax.security.*;version="0",
@@ -22,11 +22,11 @@ Import-Template:
org.osgi.util.*;version="0",
org.osgi.service.cm.*;version="0",
org.osgi.service.event.*;version="0",
- org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
+ org.eclipse.equinox.region.*;version="${equinoxRegionVersion:[=.=.=, =.+1)}",
javax.management.*;version="0",
org.eclipse.osgi.framework.*;version="0",
org.eclipse.osgi.service.resolver.*;version="0",
- org.apache.felix.service.command;status=provisional;version="${org.apache.felix.gogo.runtime:[=.=.=, =.+1)}"
+ org.apache.felix.service.command;status=provisional;version="${gogoRuntimeVersion:[=.=.=, =.+1)}"
Export-Template:
org.eclipse.virgo.shell.osgicommand.helper.*;version="${version}"
Bundle-Activator: org.eclipse.virgo.shell.osgicommand.Activator

Back to the top