Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2012-05-27 22:47:33 -0400
committerBorislav Kapukaranov2012-05-27 22:47:33 -0400
commit261b2ab06a0d4dd27190fdd50d50cb49426d117a (patch)
tree273d2dd4689b35e91e274422de64f57c64a0b91a
parent8ef64a60d097ad9bdb02a6d179e4fbd8f400665a (diff)
downloadorg.eclipse.virgo.kernel-261b2ab06a0d4dd27190fdd50d50cb49426d117a.tar.gz
org.eclipse.virgo.kernel-261b2ab06a0d4dd27190fdd50d50cb49426d117a.tar.xz
org.eclipse.virgo.kernel-261b2ab06a0d4dd27190fdd50d50cb49426d117a.zip
Revert "380765 - Adopts a shared ivy-cache and integration repo directories"
-rw-r--r--build.properties5
-rw-r--r--org.eclipse.virgo.kernel.agent.dm/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.artifact/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer.dm/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.deployer/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.dmfragment/ivy.xml4
-rw-r--r--org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.model/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.osgi/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.osgicommand/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.services/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.shell/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.smoketest/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.stubs/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.test/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.userregion/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel.userregionfactory/ivy.xml2
-rw-r--r--org.eclipse.virgo.kernel/ivy.xml2
-rw-r--r--org.eclipse.virgo.management.fragment/ivy.xml2
21 files changed, 23 insertions, 24 deletions
diff --git a/build.properties b/build.properties
index cf81315b..00fe333f 100644
--- a/build.properties
+++ b/build.properties
@@ -1,9 +1,8 @@
version=3.5.0
release.type=integration
javadoc.exclude.package.names=**/internal/**,**/internal
-ivy.cache.dir=${user.home}/ivy/ivy-cache
-integration.repo.dir=${ivy.cache.dir}/repository
-project.organisation=org.eclipse.virgo.kernel
+ivy.cache.dir=${basedir}/../ivy-cache
+integration.repo.dir=${basedir}/../integration-repo
findbugs.enforce=true
clover.enforce=true
clover.coverage=0%
diff --git a/org.eclipse.virgo.kernel.agent.dm/ivy.xml b/org.eclipse.virgo.kernel.agent.dm/ivy.xml
index fab350db..d2a4c59e 100644
--- a/org.eclipse.virgo.kernel.agent.dm/ivy.xml
+++ b/org.eclipse.virgo.kernel.agent.dm/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info module='${ant.project.name}' organisation='${project.organisation}'/>
+ <info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel'/>
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.artifact/ivy.xml b/org.eclipse.virgo.kernel.artifact/ivy.xml
index ca1c350a..44b08d03 100644
--- a/org.eclipse.virgo.kernel.artifact/ivy.xml
+++ b/org.eclipse.virgo.kernel.artifact/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info module='${ant.project.name}' organisation='${project.organisation}'/>
+ <info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel'/>
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.deployer.dm/ivy.xml b/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
index 4ac3b5c7..2b688293 100644
--- a/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer.dm/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}" />
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}" />
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.deployer.test/ivy.xml b/org.eclipse.virgo.kernel.deployer.test/ivy.xml
index b46d987e..483fb340 100644
--- a/org.eclipse.virgo.kernel.deployer.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer.test/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml b/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml
index d29bc850..7ddf0014 100644
--- a/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer.testbundle/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.deployer/ivy.xml b/org.eclipse.virgo.kernel.deployer/ivy.xml
index 6dbfccc5..760a8a93 100644
--- a/org.eclipse.virgo.kernel.deployer/ivy.xml
+++ b/org.eclipse.virgo.kernel.deployer/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.dmfragment/ivy.xml b/org.eclipse.virgo.kernel.dmfragment/ivy.xml
index a01fb169..db53f4be 100644
--- a/org.eclipse.virgo.kernel.dmfragment/ivy.xml
+++ b/org.eclipse.virgo.kernel.dmfragment/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
@@ -24,7 +24,7 @@
<dependency org="org.eclipse.virgo.nano" name="org.eclipse.virgo.kernel.core" rev="${org.eclipse.virgo.nano}" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgi" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="compile->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="compile->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="${org.eclipse.virgo.medic}" conf="aspects, compile->runtime"/>
diff --git a/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml b/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml
index 4a348c51..9ae1bcb5 100644
--- a/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml
+++ b/org.eclipse.virgo.kernel.kerneldmfragment/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.model/ivy.xml b/org.eclipse.virgo.kernel.model/ivy.xml
index e84a6b2c..7c3c5a76 100644
--- a/org.eclipse.virgo.kernel.model/ivy.xml
+++ b/org.eclipse.virgo.kernel.model/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info module="${ant.project.name}" organisation="${project.organisation}"/>
+ <info module="${ant.project.name}" organisation="org.eclipse.virgo.kernel"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.osgi/ivy.xml b/org.eclipse.virgo.kernel.osgi/ivy.xml
index b51d2346..6e3f561f 100644
--- a/org.eclipse.virgo.kernel.osgi/ivy.xml
+++ b/org.eclipse.virgo.kernel.osgi/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info module='${ant.project.name}' organisation='${project.organisation}' />
+ <info module='${ant.project.name}' organisation='org.eclipse.virgo.kernel' />
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.osgicommand/ivy.xml b/org.eclipse.virgo.kernel.osgicommand/ivy.xml
index 00e361d4..58fe224a 100644
--- a/org.eclipse.virgo.kernel.osgicommand/ivy.xml
+++ b/org.eclipse.virgo.kernel.osgicommand/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation='${project.organisation}' module='${ant.project.name}'/>
+ <info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}'/>
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.services/ivy.xml b/org.eclipse.virgo.kernel.services/ivy.xml
index ae345b00..f46e86ec 100644
--- a/org.eclipse.virgo.kernel.services/ivy.xml
+++ b/org.eclipse.virgo.kernel.services/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation='${project.organisation}' module='${ant.project.name}' />
+ <info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}' />
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.shell/ivy.xml b/org.eclipse.virgo.kernel.shell/ivy.xml
index 77638a26..563eb99c 100644
--- a/org.eclipse.virgo.kernel.shell/ivy.xml
+++ b/org.eclipse.virgo.kernel.shell/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.smoketest/ivy.xml b/org.eclipse.virgo.kernel.smoketest/ivy.xml
index 98ca4fc4..ae65507b 100644
--- a/org.eclipse.virgo.kernel.smoketest/ivy.xml
+++ b/org.eclipse.virgo.kernel.smoketest/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}" />
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}" />
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml" />
diff --git a/org.eclipse.virgo.kernel.stubs/ivy.xml b/org.eclipse.virgo.kernel.stubs/ivy.xml
index 1b85bf6a..578f770d 100644
--- a/org.eclipse.virgo.kernel.stubs/ivy.xml
+++ b/org.eclipse.virgo.kernel.stubs/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.test/ivy.xml b/org.eclipse.virgo.kernel.test/ivy.xml
index 9e59bf55..275138b4 100644
--- a/org.eclipse.virgo.kernel.test/ivy.xml
+++ b/org.eclipse.virgo.kernel.test/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.kernel.userregion/ivy.xml b/org.eclipse.virgo.kernel.userregion/ivy.xml
index 03c87f7b..a9653b4c 100644
--- a/org.eclipse.virgo.kernel.userregion/ivy.xml
+++ b/org.eclipse.virgo.kernel.userregion/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation='${project.organisation}' module='${ant.project.name}' />
+ <info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}' />
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel.userregionfactory/ivy.xml b/org.eclipse.virgo.kernel.userregionfactory/ivy.xml
index bc6eca52..4e9dafb2 100644
--- a/org.eclipse.virgo.kernel.userregionfactory/ivy.xml
+++ b/org.eclipse.virgo.kernel.userregionfactory/ivy.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation='${project.organisation}' module='${ant.project.name}'/>
+ <info organisation='org.eclipse.virgo.kernel' module='${ant.project.name}'/>
<configurations>
<include file='${virgo.build.dir}/common/default-ivy-configurations.xml'/>
diff --git a/org.eclipse.virgo.kernel/ivy.xml b/org.eclipse.virgo.kernel/ivy.xml
index 2a57024a..9c04258a 100644
--- a/org.eclipse.virgo.kernel/ivy.xml
+++ b/org.eclipse.virgo.kernel/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo.kernel" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.virgo.management.fragment/ivy.xml b/org.eclipse.virgo.management.fragment/ivy.xml
index 61cfb01e..8d012ad6 100644
--- a/org.eclipse.virgo.management.fragment/ivy.xml
+++ b/org.eclipse.virgo.management.fragment/ivy.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd" version="2.0">
- <info organisation="${project.organisation}" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.virgo" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>

Back to the top