[eclipse-jbosstools] Update locations for symlinked jars and POM macros

[Gerard Ryan]

commit 255cced47752dff023d256db9b4a09793a02c4bb
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Wed Jan 16 17:00:51 2013 +0000

    Update locations for symlinked jars and POM macros

 eclipse-jbosstools.spec |   86 +++++++++++++++++++++-------------------------
 1 files changed, 39 insertions(+), 47 deletions(-)
---
diff --git a/eclipse-jbosstools.spec b/eclipse-jbosstools.spec
index d4199dd..0234a5c 100644
--- a/eclipse-jbosstools.spec
+++ b/eclipse-jbosstools.spec
@@ -366,24 +366,21 @@ find -name '*.jar' -delete
 find -name '*.class' -delete
 
 # add symlinks to Fedora versions of removed jars
-pushd tests/plugins/org.jboss.tools.ui.bot.ext/resources/drv/
-ln -s %{_javadir}/hsqldb.jar
-popd
-pushd archives/plugins/org.jboss.ide.eclipse.archives.core/lib/
+pushd server/archives/plugins/org.jboss.ide.eclipse.archives.core/lib/
 ln -s %{_javadir}/truezip/truezip-driver-file.jar
 ln -s %{_javadir}/truezip/truezip-driver-zip.jar
 ln -s %{_javadir}/truezip/truezip-file.jar
 ln -s %{_javadir}/truezip/truezip-kernel.jar
 popd
-pushd as/plugins/org.jboss.ide.eclipse.as.dmr/
+pushd server/as/plugins/org.jboss.ide.eclipse.as.dmr/
 ln -s %{_javadir}/jboss-dmr.jar
 popd
-pushd as/plugins/org.jboss.ide.eclipse.as.core/
+pushd server/as/plugins/org.jboss.ide.eclipse.as.core/
 ln -s %{_javadir}/dom4j.jar
 ln -s %{_javadir}/jaxen.jar
 ln -s %{_javadir}/gnu-getopt.jar
 popd
-pushd as/plugins/org.jboss.ide.eclipse.as.management.as71/
+pushd server/as/plugins/org.jboss.ide.eclipse.as.management.as71/
 ln -s %{_javadir}/jboss-as/jboss-as-controller-client.jar
 ln -s %{_javadir}/jboss-as/jboss-as-protocol.jar
 ln -s %{_javadir}/jboss-dmr.jar
@@ -395,7 +392,7 @@ ln -s %{_javadir}/jboss-threads.jar
 ln -s %{_javadir}/xnio-api.jar
 ln -s %{_javadir}/xnio-nio.jar
 popd
-pushd ws/plugins/org.jboss.tools.ws.ui/lib/
+pushd webservices/plugins/org.jboss.tools.ws.ui/lib/
 ln -s %{_javadir}/axis/axis.jar
 ln -s %{_javadir}/axis/jaxrpc.jar
 ln -s %{_javadir}/resteasy/jaxrs-api.jar
@@ -405,51 +402,41 @@ ln -s %{_javadir}/freemarker.jar
 popd
 
 # Disable modules that fail to build
-## common
-%pom_disable_module site common
-%pom_disable_module tests common
-%pom_disable_module org.jboss.tools.common.mylyn common/plugins
-%pom_disable_module org.jboss.tools.common.mylyn.test common/tests
-%pom_disable_module org.jboss.tools.common.mylyn.feature common/features
-%pom_disable_module org.jboss.tools.common.all.test.feature common/features
-## usage
-%pom_disable_module site usage
-%pom_disable_module tests usage
-%pom_disable_module org.jboss.tools.usage.test.feature usage/features
-## archives
-%pom_disable_module site archives
-%pom_disable_module tests archives
-%pom_disable_module org.jboss.ide.eclipse.archives.test.feature archives/features
-## jmx
-%pom_disable_module site jmx
-%pom_disable_module tests jmx
-%pom_disable_module org.jboss.tools.jmx.test.feature jmx/features
-## as
-%pom_disable_module site as
-%pom_disable_module tests as
-%pom_disable_module org.jboss.ide.eclipse.as.test.feature as/features
+## base/common
+%pom_disable_module tests base/common
+%pom_disable_module org.jboss.tools.common.mylyn base/common/plugins
+%pom_disable_module org.jboss.tools.common.mylyn.test base/common/tests
+%pom_disable_module org.jboss.tools.common.mylyn.feature base/common/features
+%pom_disable_module org.jboss.tools.common.all.test.feature base/common/features
+## base/usage
+%pom_disable_module tests base/usage
+%pom_disable_module org.jboss.tools.usage.test.feature base/usage/features
+## server/archives
+%pom_disable_module tests server/archives
+%pom_disable_module org.jboss.ide.eclipse.archives.test.feature server/archives/features
+## server/jmx
+%pom_disable_module tests server/jmx
+%pom_disable_module org.jboss.tools.jmx.test.feature server/jmx/features
+## server/as
+%pom_disable_module tests server/as
+%pom_disable_module org.jboss.ide.eclipse.as.test.feature server/as/features
 ## jst
-%pom_disable_module site jst
 %pom_disable_module tests jst
 %pom_disable_module org.jboss.tools.jst.test.feature jst/features
-## ws
-%pom_disable_module site ws
-%pom_disable_module tests ws
-%pom_disable_module org.jboss.tools.ws.test.feature ws/features
-## cdi
-%pom_disable_module site cdi
-%pom_disable_module tests cdi
-%pom_disable_module org.jboss.tools.cdi.test.feature cdi/features
-%pom_disable_module org.jboss.tools.cdi.seam.test.feature cdi/features
-%pom_disable_module org.jboss.tools.cdi.deltaspike.test.feature cdi/features
+## webservices
+%pom_disable_module tests webservices
+%pom_disable_module org.jboss.tools.ws.test.feature webservices/features
+## javaee/cdi
+%pom_disable_module tests javaee/cdi
+%pom_disable_module org.jboss.tools.cdi.test.feature javaee/cdi/features
+%pom_disable_module org.jboss.tools.cdi.seam.test.feature javaee/cdi/features
+%pom_disable_module org.jboss.tools.cdi.deltaspike.test.feature javaee/cdi/features
 ## freemarker
-%pom_disable_module site freemarker
 %pom_disable_module tests freemarker
 %pom_disable_module org.jboss.ide.eclipse.freemarker.test.feature freemarker/features
-##runtime
-%pom_disable_module site runtime
-%pom_disable_module tests runtime
-%pom_disable_module org.jboss.tools.runtime.test.feature runtime/features
+##base/runtime
+%pom_disable_module tests base/runtime
+%pom_disable_module org.jboss.tools.runtime.test.feature base/runtime/features
 
 %patch10
 %patch12
@@ -602,6 +589,11 @@ popd;
 
 
 %changelog
+* Tue Oct 16 2012 Gerard Ryan <galileo at fedoraproject.org> - 4.0.0-1
+- Add script create-tarball.sh to create source tarball from Git.
+- Update locations for symlinked jars and POM macros.
+- Remove unnecessary pom macros.
+
 * Tue Oct 16 2012 Gerard Ryan <galileo at fedoraproject.org> - 4.0.0-0.2
 - Update to tag jbosstools-4.0.0.Alpha2.
 - Add subpackage runtime, necessary for 'as' subpackage.