bug 375645: Gemini Web artifacts are published now with an organization 'org.eclipse.gemini' in order to comply with other Gemini subprojects.
diff --git a/build-web-container/build.xml b/build-web-container/build.xml
index 55d5fa1..b0b1d5b 100644
--- a/build-web-container/build.xml
+++ b/build-web-container/build.xml
@@ -52,7 +52,7 @@
<target name="collect" depends="ivy.init">
<mkdir dir="${collect.output.dir}"/>
- <ivy:retrieve organisation="org.eclipse.gemini.web" module="org.eclipse.gemini.web" inline="true" type="jar" pattern="${collect.output.dir}/[artifact]-[revision].[ext]"/>
+ <ivy:retrieve organisation="org.eclipse.gemini" module="org.eclipse.gemini.web" inline="true" type="jar" pattern="${collect.output.dir}/[artifact]-[revision].[ext]"/>
</target>
<target name="package" depends="ivy.init">
diff --git a/build-web-container/dependencies-ivy.xml b/build-web-container/dependencies-ivy.xml
index d73496b..fef8522 100644
--- a/build-web-container/dependencies-ivy.xml
+++ b/build-web-container/dependencies-ivy.xml
@@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}" />
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}" />
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/build-web-container/package-ivy.xml b/build-web-container/package-ivy.xml
index 46986e5..7d2db61 100644
--- a/build-web-container/package-ivy.xml
+++ b/build-web-container/package-ivy.xml
@@ -2,7 +2,7 @@
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}" />
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}" />
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
@@ -10,9 +10,9 @@
</configurations>
<dependencies>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.core" rev="latest.integration" conf="package->runtime"/>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.tomcat" rev="latest.integration" conf="package->runtime"/>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.extender" rev="latest.integration" conf="package->runtime"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.core" rev="latest.integration" conf="package->runtime"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.tomcat" rev="latest.integration" conf="package->runtime"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.extender" rev="latest.integration" conf="package->runtime"/>
</dependencies>
</ivy-module>
\ No newline at end of file
diff --git a/org.eclipse.gemini.web.core/ivy.xml b/org.eclipse.gemini.web.core/ivy.xml
index 5bae8e3..39c2399 100644
--- a/org.eclipse.gemini.web.core/ivy.xml
+++ b/org.eclipse.gemini.web.core/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.gemini.web.documentation/programmer-guide/ivy.xml b/org.eclipse.gemini.web.documentation/programmer-guide/ivy.xml
index e182cac..5cade4e 100755
--- a/org.eclipse.gemini.web.documentation/programmer-guide/ivy.xml
+++ b/org.eclipse.gemini.web.documentation/programmer-guide/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.gemini.web.documentation/user-guide/ivy.xml b/org.eclipse.gemini.web.documentation/user-guide/ivy.xml
index e182cac..5cade4e 100755
--- a/org.eclipse.gemini.web.documentation/user-guide/ivy.xml
+++ b/org.eclipse.gemini.web.documentation/user-guide/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/org.eclipse.gemini.web.extender/ivy.xml b/org.eclipse.gemini.web.extender/ivy.xml
index 7a4e733..57d8b6b 100644
--- a/org.eclipse.gemini.web.extender/ivy.xml
+++ b/org.eclipse.gemini.web.extender/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
@@ -25,7 +25,7 @@
<dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="${org.easymock}" conf="test->runtime"/>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.core" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.core" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.eclipse.virgo.teststubs" name="org.eclipse.virgo.teststubs.osgi" rev="${org.eclipse.virgo.teststubs}" conf="test->runtime"/>
</dependencies>
diff --git a/org.eclipse.gemini.web.test/ivy.xml b/org.eclipse.gemini.web.test/ivy.xml
index 07231f2..6eb29d5 100644
--- a/org.eclipse.gemini.web.test/ivy.xml
+++ b/org.eclipse.gemini.web.test/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
@@ -29,8 +29,8 @@
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="${org.easymock}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.osgi" name="org.eclipse.virgo.osgi.launcher" rev="${org.eclipse.virgo.osgi}" conf="test->runtime"/>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.core" rev="latest.integration"/>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.tomcat" rev="latest.integration"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.core" rev="latest.integration"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.tomcat" rev="latest.integration"/>
<dependency org="javax.activation" name="com.springsource.javax.activation" rev="${javax.activation}" />
diff --git a/org.eclipse.gemini.web.tomcat/ivy.xml b/org.eclipse.gemini.web.tomcat/ivy.xml
index 1c089d9..630b819 100644
--- a/org.eclipse.gemini.web.tomcat/ivy.xml
+++ b/org.eclipse.gemini.web.tomcat/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
@@ -26,7 +26,7 @@
<dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
<dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="test->runtime"/>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.core" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.core" rev="latest.integration" conf="compile->compile"/>
<dependency org="javax.annotation" name="javax.annotation" rev="${javax.annotation}" conf="compile->runtime"/>
<dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="${javax.ejb}" conf="compile->runtime,provided"/>
<dependency org="javax.el" name="javax.el" rev="${javax.el}" conf="compile->runtime"/>
diff --git a/org.eclipse.gemini.web/ivy.xml b/org.eclipse.gemini.web/ivy.xml
index d7c9fc5..c60812f 100644
--- a/org.eclipse.gemini.web/ivy.xml
+++ b/org.eclipse.gemini.web/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
@@ -14,9 +14,9 @@
<publications/>
<dependencies>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.core" rev="latest.integration"/>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.extender" rev="latest.integration"/>
- <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.tomcat" rev="latest.integration"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.core" rev="latest.integration"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.extender" rev="latest.integration"/>
+ <dependency org="org.eclipse.gemini" name="org.eclipse.gemini.web.tomcat" rev="latest.integration"/>
</dependencies>
</ivy-module>
diff --git a/test-bundles/customizer-bundle/ivy.xml b/test-bundles/customizer-bundle/ivy.xml
index 6980ccf..32a12aa 100755
--- a/test-bundles/customizer-bundle/ivy.xml
+++ b/test-bundles/customizer-bundle/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/test-bundles/fragment-provides-web-xml/ivy.xml b/test-bundles/fragment-provides-web-xml/ivy.xml
index d377163..8a93064 100755
--- a/test-bundles/fragment-provides-web-xml/ivy.xml
+++ b/test-bundles/fragment-provides-web-xml/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/test-bundles/simple-manifest-only/ivy.xml b/test-bundles/simple-manifest-only/ivy.xml
index d377163..8a93064 100644
--- a/test-bundles/simple-manifest-only/ivy.xml
+++ b/test-bundles/simple-manifest-only/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/test-bundles/simple-war/ivy.xml b/test-bundles/simple-war/ivy.xml
index d4db36c..e3c1fb6 100644
--- a/test-bundles/simple-war/ivy.xml
+++ b/test-bundles/simple-war/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/test-bundles/war-with-annotations/ivy.xml b/test-bundles/war-with-annotations/ivy.xml
index e4ddb6c..c120be7 100755
--- a/test-bundles/war-with-annotations/ivy.xml
+++ b/test-bundles/war-with-annotations/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/test-bundles/war-with-another-servlet/ivy.xml b/test-bundles/war-with-another-servlet/ivy.xml
index e4ddb6c..c120be7 100644
--- a/test-bundles/war-with-another-servlet/ivy.xml
+++ b/test-bundles/war-with-another-servlet/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/test-bundles/war-with-context-xml-cross-context/ivy.xml b/test-bundles/war-with-context-xml-cross-context/ivy.xml
index 6b5a9c8..e18785a 100755
--- a/test-bundles/war-with-context-xml-cross-context/ivy.xml
+++ b/test-bundles/war-with-context-xml-cross-context/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/test-bundles/war-with-context-xml-custom-classloader/ivy.xml b/test-bundles/war-with-context-xml-custom-classloader/ivy.xml
index 6b5a9c8..e18785a 100755
--- a/test-bundles/war-with-context-xml-custom-classloader/ivy.xml
+++ b/test-bundles/war-with-context-xml-custom-classloader/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/test-bundles/war-with-jsp/ivy.xml b/test-bundles/war-with-jsp/ivy.xml
index e4ddb6c..c120be7 100644
--- a/test-bundles/war-with-jsp/ivy.xml
+++ b/test-bundles/war-with-jsp/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/test-bundles/war-with-servlet/ivy.xml b/test-bundles/war-with-servlet/ivy.xml
index e4ddb6c..c120be7 100644
--- a/test-bundles/war-with-servlet/ivy.xml
+++ b/test-bundles/war-with-servlet/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/test-bundles/war-with-tld/ivy.xml b/test-bundles/war-with-tld/ivy.xml
index e7a58d1..225fee8 100644
--- a/test-bundles/war-with-tld/ivy.xml
+++ b/test-bundles/war-with-tld/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
diff --git a/test-bundles/war-with-web-xml-from-fragment/ivy.xml b/test-bundles/war-with-web-xml-from-fragment/ivy.xml
index 6b5a9c8..e18785a 100755
--- a/test-bundles/war-with-web-xml-from-fragment/ivy.xml
+++ b/test-bundles/war-with-web-xml-from-fragment/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.gemini.web" module="${ant.project.name}"/>
+ <info organisation="org.eclipse.gemini" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
