diff --git a/common/common.xml b/common/common.xml
index e8b228c..8c35a2a 100644
--- a/common/common.xml
+++ b/common/common.xml
@@ -26,13 +26,9 @@
 		<equals arg1="integration" arg2="${release.type}"/>
 	</condition>
 
-	<condition property="publication.resolver.prefix" value="local" else="remote">
-		<istrue value="${local.build}"/>
-	</condition>
-
 <!-- Main targets -->
 	<target name="clean" description="Removes the target directory.">
-		<delete quiet="true" dir="${target.dir}"/>
+		<delete quiet="false" failonerror="false" dir="${target.dir}"/>
 	</target>
 
 	<target name="clean-integration" description="Removes the integration repository directory.">
@@ -50,7 +46,20 @@
 				</not>
 			</condition>
 		</fail>
-		<delete dir="${integration.repo.dir}/${project.organisation}"/>
+		<echo message="Project Integration Repo: ${integration.repo.dir}/${project.organisation}"/>
+		<delete quiet="false" failonerror="false" dir="${integration.repo.dir}/${project.organisation}"/>
+	</target>
+
+	<target name="clean-all-integration" description="Removes the integration repository directory.">
+		<fail message="The 'integration.repo.dir' property must be set on this project.">
+			<condition>
+				<not>
+					<isset property="integration.repo.dir"/>
+				</not>
+			</condition>
+		</fail>
+		<echo message="Integration Repo: ${integration.repo.dir}"/>
+		<delete quiet="false" failonerror="false" dir="${integration.repo.dir}"/>
 	</target>
 
 	<target name="clean-ivy" description="Removes the ivy cache directory.">
@@ -61,7 +70,8 @@
 				</not>
 			</condition>
 		</fail>
-		<delete quiet="true" dir="${ivy.cache.dir}"/>
+		<echo message="Ivy Cache: ${ivy.cache.dir}"/>
+		<delete quiet="false" failonerror="false" dir="${ivy.cache.dir}"/>
 	</target>
 
 	<target name="resolve" depends="resolve.init" description="Retrieves all external dependencies for this project.">
diff --git a/common/ivysettings.xml b/common/ivysettings.xml
index 6220556..35b9171 100644
--- a/common/ivysettings.xml
+++ b/common/ivysettings.xml
@@ -50,38 +50,20 @@
 		</url>
 	</macrodef>
 
-	<macrodef name="localrepo">
-		<filesystem descriptor="required">
-			<ivy pattern="${local.repo.dir}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
-			<artifact pattern="${local.repo.dir}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
-		</filesystem>
-	</macrodef>
-
 	<resolvers>
-<!-- Integration repositories -->
+<!-- Lookup repositories -->
+
 		<filesystem name="integration" descriptor="required" >
 			<ivy pattern="${integration.repo.dir}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
 			<artifact pattern="${integration.repo.dir}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
 		</filesystem>
 
-<!-- Lookup repositories -->
-
-		<url name="eclipse-external-lookup">
-			<ivy pattern="http://build.eclipse.org/rt/virgo/external/[module]/ivy-[revision].xml"/>
-			<artifact pattern="http://build.eclipse.org/rt/virgo/external/[module]/[artifact]-[revision].[ext]"/>
-		</url>
-
 		<chain name="external-lookup" returnFirst="true">
-			<localrepo name="local-external-repository"/>
 			<s3repo name="bundle-external-repository"			bucket="repository.springsource.com" artifact.type="bundles" release.type="external"/>
 			<s3repo name="library-external-repository"			bucket="repository.springsource.com" artifact.type="libraries" release.type="external"/>
-			<s3repo name="private-bundle-external-repository"	bucket="private.repository.springsource.com" artifact.type="bundles" release.type="external"/>
-			<s3repo name="private-library-external-repository"	bucket="private.repository.springsource.com" artifact.type="libraries" release.type="external"/>
 		</chain>
 
 		<chain name="third-party-lookup" returnFirst="true">
-			<resolver ref="integration"/>
-			<localrepo name="local"/>
 			<s3repo name="bundle-release-repository"		bucket="repository.springsource.com" artifact.type="bundles" release.type="release"/>
 			<s3repo name="bundle-milestone-repository"		bucket="repository.springsource.com" artifact.type="bundles" release.type="milestone"/>
 			<s3repo name="bundle-snapshot-repository"		bucket="repository.springsource.com" artifact.type="bundles" release.type="snapshot"/>
@@ -92,7 +74,6 @@
 
 		<chain name="virgo-lookup" returnFirst="true">
 			<resolver ref="integration"/>
-			<localrepo name="local"/>
 			<eclipse-build-read name="eclipse-bundle-release-repository"	    artifact.type="bundles" release.type="release"/>
 			<eclipse-build-read name="eclipse-bundle-milestone-repository"	    artifact.type="bundles" release.type="milestone"/>
 			<eclipse-build-read name="eclipse-bundle-snapshot-repository"	    artifact.type="bundles" release.type="snapshot"/>
@@ -102,30 +83,21 @@
 		</chain>
 
 		<chain name="gemini-lookup" returnFirst="true">
-			<resolver ref="integration"/>
-			<localrepo name="local"/>
-			<eclipse-build-read name="eclipse-bundle-release-repository"	    artifact.type="bundles" release.type="release"/>
-			<eclipse-build-read name="eclipse-bundle-milestone-repository"	    artifact.type="bundles" release.type="milestone"/>
-			<eclipse-build-read name="eclipse-bundle-snapshot-repository"	    artifact.type="bundles" release.type="snapshot"/>
-			<eclipse-build-read name="eclipse-library-release-repository"	    artifact.type="libraries" release.type="release"/>
-			<eclipse-build-read name="eclipse-library-milestone-repository"		artifact.type="libraries" release.type="milestone"/>
-			<eclipse-build-read name="eclipse-library-snapshot-repository"	    artifact.type="libraries" release.type="snapshot"/>
+			<resolver ref="virgo-lookup"/>
 			<resolver ref="external-lookup"/>
 		</chain>
 
 <!-- Publishing repositories -->
 		<eclipse-build name="eclipse-remote-bundle-publish"		artifact.type="bundles"		release.type="${adjusted.release.type}"/>
 		<eclipse-build name="eclipse-remote-library-publish"	artifact.type="libraries"	release.type="${adjusted.release.type}"/>
-		<localrepo name="eclipse-local-bundle-publish"/>
-		<localrepo name="eclipse-local-library-publish"/>
+		
 	</resolvers>
 
 	<modules>
-		<module organisation="org.springframework.*"	name="*"		resolver="third-party-lookup"/>
-		<module organisation="com.springsource.*"		name="*"		resolver="third-party-lookup"/>
-		<module organisation="org.eclipse.virgo.*"		name="*"		resolver="virgo-lookup"/>
-		<module organisation="org.eclipse.gemini.*"		name="*"		resolver="gemini-lookup"/>
-		<module organisation="org.eclipse"				name="*"		resolver="eclipse-external-lookup"/>
+		<module organisation="org.springframework.*"	resolver="third-party-lookup"/>
+		<module organisation="com.springsource.*"		resolver="third-party-lookup"/>
+		<module organisation="org.eclipse.virgo.*"		resolver="virgo-lookup"/> <!-- This will also catch all the org.eclipse.virgo.mirror artifacts from orbit -->
+		<module organisation="org.eclipse.gemini.*"		resolver="gemini-lookup"/>
 	</modules>
 
 </ivysettings>
diff --git a/common/publish.xml b/common/publish.xml
index 4fbc3dc..28ac6b0 100644
--- a/common/publish.xml
+++ b/common/publish.xml
@@ -19,23 +19,23 @@
 	<target name="publish-ivy" depends="ivy.init, resolve" description="Publishes all artifacts to remote Eclipse Ivy repositories">
 		<delete quiet="true" file="${ivy.output.file}"/>
 		<mkdir dir="${ivy.output.dir}"/>
-		<ivy:publish resolver="eclipse-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
+		<ivy:publish resolver="eclipse-remote-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
 			<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${jar.output.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/>
 		</ivy:publish>
 	</target>
     
-    <target name="publish-mirrored-ivy" depends="ivy.init, resolve" description="Publishes all artifacts to remote Eclipse Ivy repositories">
+    <target name="publish-mirrored-ivy" depends="ivy.init, resolve" description="Publishes all mirrored Orbit artifacts to remote Eclipse Ivy repositories">
 		<mkdir dir="${ivy.output.dir}"/>
-		<ivy:publish resolver="eclipse-${publication.resolver.prefix}-bundle-publish" overwrite="true" organisation="${organisation}" module="${module}" pubrevision="${revision}" status="release">
+		<ivy:publish resolver="eclipse-remote-bundle-publish" overwrite="true" organisation="${organisation}" module="${module}" pubrevision="${revision}" status="release">
 			<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${jar.output.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/>
 		</ivy:publish>
 	</target>
 
-	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build" description="Publishes all artifacts to remote Eclipse Maven repositories">
+	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init"  description="Publishes all artifacts to remote Eclipse Maven repositories">
 		<maven:deploy file="${jar.output.file}">
 			<remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
 				<authentication username="${eclipse.buildId}" privateKey="${key.file}"/>
@@ -74,13 +74,11 @@
 			<mapping conf="runtime" scope="runtime"/>
 			<mapping conf="test" scope="test"/>
 		</ivy:makepom>
-		<replaceregexp flags="g" match="latest.integration" replace="${project.version}"
-			file="${pom.output.file}"/>
+		<replaceregexp flags="g" match="latest.integration" replace="${project.version}" file="${pom.output.file}"/>
 	</target>
 
 	<target name="snapshot.pom" depends="is.snapshot" if="snapshot.release">
-		<replaceregexp flags="g" match="(\d(.\d(.\d)?)?).${build.stamp}" replace="\1.BUILD-SNAPSHOT"
-			file="${pom.output.file}"/>
+		<replaceregexp flags="g" match="(\d(.\d(.\d)?)?).${build.stamp}" replace="\1.BUILD-SNAPSHOT" file="${pom.output.file}"/>
 	</target>
 
 	<target name="is.snapshot">
diff --git a/docbook/publish.xml b/docbook/publish.xml
index bd98a00..230e644 100644
--- a/docbook/publish.xml
+++ b/docbook/publish.xml
@@ -19,7 +19,7 @@
 	<target name="publish-ivy" depends="ivy.init, resolve">
 		<delete quiet="true" file="${ivy.output.file}"/>
 		<mkdir dir="${ivy.output.dir}" />
-		<ivy:publish resolver="eclipse-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
+		<ivy:publish resolver="eclipse-remote-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
 			<artifacts pattern="${docbook.output.dir}/html/[artifact].[ext]"/>
 			<artifacts pattern="${docbook.output.dir}/htmlsingle/[artifact].[ext]"/>
 			<!-- <artifacts pattern="${docbook.output.dir}/pdf/[artifact].[ext]"/> -->
@@ -27,7 +27,7 @@
 		</ivy:publish>
 	</target>
 
-	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
+	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" >
 		<maven:deploy >
 			<remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
 				<authentication username="${eclipse.buildId}" privateKey="${key.file}"/>
diff --git a/library/artifact.xml b/library/artifact.xml
deleted file mode 100644
index bd83a7a..0000000
--- a/library/artifact.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   VMware Inc. - initial contribution
- ******************************************************************************
--->
-<project name="artifact-library" xmlns:ivy="antlib:org.apache.ivy.ant">
-
-	<import file="common.xml"/>
-	
-	<filterset id="library.filters" />
-
-<!-- Main targets -->
-	<target name="javadoc-all" description="Does nothing"/>
-
-	<target name="javadoc-api" description="Does nothing."/>
-
-	<target name="jar" depends="ivy.init, resolve.compile"
-			description="Creates a libd file with the proper versions substituted.">
-		<delete quiet="true" file="${ivy.output.file}"/>
-		<mkdir dir="${ivy.output.dir}"/>
-		<delete quiet="true" file="${libd.output.file}"/>
-		<mkdir dir="${libd.output.dir}"/>
-
-		<copy file="${libd.input.file}" tofile="${libd.output.file}">
-			<filterset>
-				<filter token="bundle.version" value="${bundle.version}"/>
-				<filterset refid="library.filters"/>
-			</filterset>
-		</copy>
-
-		<ivy:publish resolver="integration" pubdate="${timestamp}" status="${release.type}">
-			<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
-			<artifacts pattern="${libd.output.dir}/[artifact].[ext]"/>
-		</ivy:publish>
-	</target>
-
-<!-- Other targets -->
-	<target name="javadoc.prep"/>
-
-</project>
diff --git a/library/common.xml b/library/common.xml
deleted file mode 100644
index 7e708fe..0000000
--- a/library/common.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   VMware Inc. - initial contribution
- ******************************************************************************
--->
-<project name="common-library" xmlns:s="antlib:org.springframework.build">
-
-	<import file="../common/common.xml"/>
-
-</project>
diff --git a/library/default.xml b/library/default.xml
deleted file mode 100644
index c4a40d4..0000000
--- a/library/default.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   VMware Inc. - initial contribution
- ******************************************************************************
--->
-<project name="default-library">
-
-	<import file="common.xml"/>
-	<import file="artifact.xml"/>
-	<import file="quality.xml"/>
-	<import file="package.xml"/>
-	<import file="publish.xml"/>
-
-</project>
diff --git a/library/package.xml b/library/package.xml
deleted file mode 100644
index db2add8..0000000
--- a/library/package.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   VMware Inc. - initial contribution
- ******************************************************************************
--->
-<project name="package-library">
-
-	<import file="common.xml"/>
-	<import file="../common/package.xml"/>
-
-<!-- Macros -->
-	<macrodef name="dist-jar">
-		<attribute name="output.dir" default="${package.dist.dir}"/>
-		<sequential>
-			<mkdir dir="@{output.dir}"/>
-			<copy file="${libd.output.file}" tofile="@{output.dir}/${package.libd.output.file}"/>
-		</sequential>
-	</macrodef>
-
-	<macrodef name="src-jar">
-		<attribute name="output.dir" default="${package.src.dir}"/>
-		<sequential>
-		</sequential>
-	</macrodef>
-
-</project>
diff --git a/library/publish.xml b/library/publish.xml
deleted file mode 100644
index f2f9cbc..0000000
--- a/library/publish.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   VMware Inc. - initial contribution
- ******************************************************************************
--->
-<project name="publish-library" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:maven="antlib:org.apache.maven.artifact.ant">
-
-	<import file="common.xml"/>
-	<import file="../common/publish.xml"/>
-
-	<target name="publish-ivy" depends="common-common.ivy.init, common-common.resolve">
-		<delete quiet="true" file="${ivy.output.file}"/>
-		<mkdir dir="${ivy.output.dir}" />
-		<ivy:publish resolver="eclipse-${publication.resolver.prefix}-library-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
-			<artifacts pattern="${libd.output.dir}/[artifact].[ext]"/>
-			<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
-		</ivy:publish>
-	</target>
-	
-	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
-		<maven:deploy file="${libd.output.file}">
-			<remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
-				<authentication username="${eclipse.buildId}" privateKey="${key.file}"/>
-			</remoteRepository>
-			<pom file="${pom.output.file}"/>
-		</maven:deploy>
-	</target>
-
-	<target name="install-maven" depends="create.pom, snapshot.pom, maven.init">
-		<maven:install file="${libd.output.file}">
-			<pom file="${pom.output.file}"/>
-		</maven:install>
-	</target>
-
-	<target name="create.pom" depends="ivy.init, resolve">
-		<delete quiet="true" file="${pom.output.file}"/>
-		<mkdir dir="${pom.output.dir}"/>
-
-		<ivy:makepom ivyfile="${ivy.output.file}" pomfile="${pom.output.file}">
-			<mapping conf="compile" scope="compile"/>
-			<mapping conf="provided" scope="provided"/>
-			<mapping conf="server-provided" scope="provided"/>
-			<mapping conf="runtime" scope="runtime"/>
-			<mapping conf="test" scope="test"/>
-		</ivy:makepom>
-
-		<replaceregexp match="&lt;packaging&gt;jar&lt;/packaging&gt;"
-				replace="&lt;packaging&gt;libd&lt;/packaging&gt;"
-				file="${pom.output.file}"/>
-	</target>
-
-</project>
diff --git a/library/quality.xml b/library/quality.xml
deleted file mode 100644
index d2180b6..0000000
--- a/library/quality.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   VMware Inc. - initial contribution
- ******************************************************************************
--->
-<project name="quality-library">
-
-<!-- Main targets -->
-	<target name="test" description="Does nothing."/>
-
-	<target name="clover" description="Does nothing."/>
-
-	<target name="findbugs" description="Does nothing."/>
-
-	<target name="osgi-validate" description="Does nothing."/>
-
-<!-- Other targets -->
-	<target name="test.do" description="Does nothing."/>
-
-	<target name="clover.do" description="Does nothing."/>
-
-	<target name="findbugs.do" description="Does nothing."/>
-
-</project>
diff --git a/multi-bundle/common.xml b/multi-bundle/common.xml
index e48fee8..727b183 100644
--- a/multi-bundle/common.xml
+++ b/multi-bundle/common.xml
@@ -93,9 +93,8 @@
     </target>
 
 <!-- Main targets -->
-	<target name="clean"
-			description="Removes the target directory.">
-		<delete quiet="true" dir="${target.dir}"/>
+	<target name="clean" description="Removes the target directory.">
+		<delete quiet="false" failonerror="false" dir="${target.dir}"/>
 		<all-bundles target="clean"/>
 	</target>
 
@@ -114,11 +113,23 @@
 				</not>
 			</condition>
 		</fail>
-		<delete dir="${integration.repo.dir}/${project.organisation}"/>
+		<echo message="Project Integration Repo: ${integration.repo.dir}/${project.organisation}"/>
+		<delete quiet="false" failonerror="false" dir="${integration.repo.dir}/${project.organisation}"/>
 	</target>
 
-	<target name="clean-ivy" depends="ivy.init"
-			description="Removes the ivy cache directory.">
+	<target name="clean-all-integration" description="Removes the integration repository directory.">
+		<fail message="The 'integration.repo.dir' property must be set on this project.">
+			<condition>
+				<not>
+					<isset property="integration.repo.dir"/>
+				</not>
+			</condition>
+		</fail>
+		<echo message="Integration Repo: ${integration.repo.dir}"/>
+		<delete quiet="false" failonerror="false" dir="${integration.repo.dir}"/>
+	</target>
+
+	<target name="clean-ivy" depends="ivy.init" description="Removes the ivy cache directory.">
 		<fail message="The 'ivy.cache.dir' property must be set on this project.">
 			<condition>
 				<not>
@@ -126,7 +137,8 @@
 				</not>
 			</condition>
 		</fail>
-		<delete quiet="true" dir="${ivy.cache.dir}"/>
+		<echo message="Ivy Cache: ${ivy.cache.dir}"/>
+		<delete quiet="false" failonerror="false" dir="${ivy.cache.dir}"/>
 	</target>
 
 <!-- Other targets -->
diff --git a/par/publish.xml b/par/publish.xml
index c0c761f..2f0819c 100644
--- a/par/publish.xml
+++ b/par/publish.xml
@@ -19,14 +19,14 @@
 	<target name="publish-ivy" depends="common-common.ivy.init, common-common.resolve">
 		<delete quiet="true" file="${ivy.output.file}"/>
 		<mkdir dir="${ivy.output.dir}" />
-		<ivy:publish resolver="eclipse-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
+		<ivy:publish resolver="eclipse-remote-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
 			<artifacts pattern="${par.output.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
 		</ivy:publish>
 	</target>
 
-	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
+	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" >
 		<maven:deploy file="${par.output.file}">
 			<remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
 				<authentication username="${eclipse.buildId}" privateKey="${key.file}"/>
diff --git a/resource/publish.xml b/resource/publish.xml
index fd69d5a..e821b14 100644
--- a/resource/publish.xml
+++ b/resource/publish.xml
@@ -19,19 +19,18 @@
 	<target name="publish-ivy" depends="ivy.init, resolve">
 		<delete quiet="true" file="${ivy.output.file}"/>
 		<mkdir dir="${ivy.output.dir}" />
-		<ivy:publish resolver="eclipse-${publication.resolver.prefix}-library-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
+		<ivy:publish resolver="eclipse-remote-library-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
 			<artifacts pattern="${artifacts.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
 		</ivy:publish>
 	</target>
 
-	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
+	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" >
 		<maven:deploy>
 			<remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
 				<authentication username="${eclipse.buildId}" privateKey="${key.file}"/>
 			</remoteRepository>
 			<pom file="${pom.output.file}"/>
-			<!-- <attach file="${source-jar.output.file}" classifier="sources"/> -->
 		</maven:deploy>
 	</target>
 
diff --git a/wab/publish.xml b/wab/publish.xml
index 02f3009..c5ff4e7 100644
--- a/wab/publish.xml
+++ b/wab/publish.xml
@@ -20,14 +20,14 @@
 	<target name="publish-ivy" depends="ivy.init, resolve">
 		<delete quiet="true" file="${ivy.output.file}"/>
 		<mkdir dir="${ivy.output.dir}" />
-		<ivy:publish resolver="eclipse-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
+		<ivy:publish resolver="eclipse-remote-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
 			<artifacts pattern="${wab.output.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
 		</ivy:publish>
 	</target>
 
-	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
+	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" >
 		<maven:deploy file="${wab.output.file}">
 			<remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
 				<authentication username="${eclipse.buildId}" privateKey="${key.file}"/>
diff --git a/war/publish.xml b/war/publish.xml
index 739fb7d..3895871 100644
--- a/war/publish.xml
+++ b/war/publish.xml
@@ -19,14 +19,14 @@
 	<target name="publish-ivy" depends="ivy.init, resolve">
 		<delete quiet="true" file="${ivy.output.file}"/>
 		<mkdir dir="${ivy.output.dir}" />
-		<ivy:publish resolver="eclipse-${publication.resolver.prefix}-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
+		<ivy:publish resolver="eclipse-remote-bundle-publish" overwrite="true" pubdate="${timestamp}" status="${release.type}">
 			<artifacts pattern="${war.output.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/>
 			<artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/>
 		</ivy:publish>
 	</target>
 
-	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build">
+	<target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" >
 		<maven:deploy file="${war.output.file}">
 			<remoteRepository url="scp://build.eclipse.org/opt/public/rt/virgo/maven/bundles/${adjusted.release.type}">
 				<authentication username="${eclipse.buildId}" privateKey="${key.file}"/>