[eclipse-jbosstools] Update to tag jbosstools-4.0.0.Alpha2
Gerard Ryan
galileo at fedoraproject.org
Tue Oct 16 23:23:13 UTC 2012
commit 36352fe52e1e01019cc711d5a89c2f29026e0f90
Author: Gerard Ryan <gerard at ryan.lt>
Date: Wed Oct 17 00:16:26 2012 +0100
Update to tag jbosstools-4.0.0.Alpha2
- Add subpackage runtime, necessary for 'as' subpackage.
- Shorten summary line.
- Rebase patches 14, 15, 16, 21, 23; append -4.0.0 to patch name.
- Remove patches 13, 20.
- Remove dependency on jbossxb.
...tools-archives-core-buildproperties-4.0.0.patch | 13 ++
...e-jbosstools-archives-core-manifest-4.0.0.patch | 18 +++
...bosstools-archives-core-trueziputil-4.0.0.patch | 162 ++++++++++++++++++++
eclipse-jbosstools-as.dmr-4.0.0.patch | 33 ++++
eclipse-jbosstools-as.mgmt.as71-4.0.0.patch | 86 +++++++++++
eclipse-jbosstools.spec | 98 +++++++-----
6 files changed, 372 insertions(+), 38 deletions(-)
---
diff --git a/eclipse-jbosstools-archives-core-buildproperties-4.0.0.patch b/eclipse-jbosstools-archives-core-buildproperties-4.0.0.patch
new file mode 100644
index 0000000..8d1d629
--- /dev/null
+++ b/eclipse-jbosstools-archives-core-buildproperties-4.0.0.patch
@@ -0,0 +1,13 @@
+--- archives/plugins/org.jboss.ide.eclipse.archives.core/build.properties.orig 2012-10-06 23:28:51.266053740 +0100
++++ archives/plugins/org.jboss.ide.eclipse.archives.core/build.properties 2012-10-06 23:32:14.601378382 +0100
+@@ -5,7 +5,9 @@
+ LICENSE-truezip.txt,\
+ log4j.xml,\
+ archivescore-eclipse.jar,\
+- lib/truezip-6.6.jar,\
++ lib/truezip-file.jar,\
++ lib/truezip-driver-file.jar,\
++ lib/truezip-driver-zip.jar,\
+ plugin.properties,\
+ about.html
+ source.archivescore.jar = src/main/,\
diff --git a/eclipse-jbosstools-archives-core-manifest-4.0.0.patch b/eclipse-jbosstools-archives-core-manifest-4.0.0.patch
new file mode 100644
index 0000000..e746505
--- /dev/null
+++ b/eclipse-jbosstools-archives-core-manifest-4.0.0.patch
@@ -0,0 +1,18 @@
+--- archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF.orig 2012-10-06 22:36:33.278555546 +0100
++++ archives/plugins/org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF 2012-10-06 22:39:38.069670314 +0100
+@@ -18,9 +18,12 @@
+ Eclipse-BundleShape: dir
+ Bundle-ClassPath: archivescore.jar,
+ archivescore-eclipse.jar,
+- lib/truezip-6.6.jar
+-Export-Package: de.schlichtherle.io;x-friends:="org.jboss.ide.eclipse.archives.test",
+- de.schlichtherle.io.archive.spi,
++ lib/truezip-file.jar,
++ lib/truezip-kernel.jar,
++ lib/truezip-driver-file.jar,
++ lib/truezip-driver-zip.jar
++Export-Package: de.schlichtherle.truezip.file;x-friends:="org.jboss.ide.eclipse.archives.test",
++ de.schlichtherle.fs.archive,
+ org.jboss.ide.eclipse.archives.core,
+ org.jboss.ide.eclipse.archives.core.ant,
+ org.jboss.ide.eclipse.archives.core.asf,
diff --git a/eclipse-jbosstools-archives-core-trueziputil-4.0.0.patch b/eclipse-jbosstools-archives-core-trueziputil-4.0.0.patch
new file mode 100644
index 0000000..b31c26c
--- /dev/null
+++ b/eclipse-jbosstools-archives-core-trueziputil-4.0.0.patch
@@ -0,0 +1,162 @@
+--- archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java.orig 2012-10-06 23:38:32.312365099 +0100
++++ archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java 2012-10-07 19:57:56.716224298 +0100
+@@ -14,11 +14,12 @@
+
+ import org.eclipse.core.runtime.IPath;
+
+-import de.schlichtherle.io.AbstractArchiveDetector;
+-import de.schlichtherle.io.ArchiveDetector;
+-import de.schlichtherle.io.ArchiveException;
+-import de.schlichtherle.io.archive.spi.ArchiveDriver;
+-import de.schlichtherle.io.archive.zip.Zip32Driver;
++//import de.schlichtherle.truezip.file.AbstractArchiveDetector;
++import de.schlichtherle.truezip.file.TFile;
++import de.schlichtherle.truezip.file.TArchiveDetector;
++import de.schlichtherle.truezip.fs.FsSyncException;
++import de.schlichtherle.truezip.fs.FsArchiveDriver;
++import de.schlichtherle.truezip.fs.archive.zip.ZipDriver;
+
+ /**
+ * Accesses raw files with the truezip filesystem
+@@ -27,17 +28,17 @@
+ */
+ public class TrueZipUtil {
+
+- public static de.schlichtherle.io.File getFile(IPath path) {
+- return getFile(path, ArchiveDetector.DEFAULT);
++ public static de.schlichtherle.truezip.file.TFile getFile(IPath path) {
++ return getFile(path, TArchiveDetector.ALL);
+ }
+- public static de.schlichtherle.io.File getFile(IPath path, ArchiveDetector detector) {
+- return new de.schlichtherle.io.File(path.toOSString(), detector);
++ public static de.schlichtherle.truezip.file.TFile getFile(IPath path, TArchiveDetector detector) {
++ return new de.schlichtherle.truezip.file.TFile(path.toOSString(), detector);
+ }
+
+ public static boolean pathExists(IPath path) {
+ return pathExists( getFile(path));
+ }
+- public static boolean pathExists( de.schlichtherle.io.File file) {
++ public static boolean pathExists( de.schlichtherle.truezip.file.TFile file) {
+ return file.exists();
+ }
+
+@@ -46,7 +47,7 @@
+ return getTimestamp( getFile(path));
+ }
+
+- public static long getTimestamp(de.schlichtherle.io.File file) {
++ public static long getTimestamp(de.schlichtherle.truezip.file.TFile file) {
+ return file.lastModified();
+ }
+
+@@ -55,28 +56,32 @@
+ return copyFile(source, getFile(dest), true);
+ }
+
+- public static boolean copyFile(String source, de.schlichtherle.io.File file, boolean updateTimestamps) {
++ public static boolean copyFile(String source, de.schlichtherle.truezip.file.TFile file, boolean updateTimestamps) throws IOException {
+ file.getParentFile().mkdirs();
+- boolean b = new de.schlichtherle.io.File(source, ArchiveDetector.NULL).archiveCopyAllTo(file);
++ de.schlichtherle.truezip.file.TFile tf = new de.schlichtherle.truezip.file.TFile(source, TArchiveDetector.NULL).cp_rp(file);
++
++ boolean b = false;
++ if (tf.exists())
++ b = true;
+ return b && (updateTimestamps ? updateParentTimestamps(file) : true);
+ }
+
+ public static boolean touchFile(IPath path) {
+- de.schlichtherle.io.File f = getFile(path);
++ de.schlichtherle.truezip.file.TFile f = getFile(path);
+ boolean b = f.setLastModified(System.currentTimeMillis());
+ return b && updateParentTimestamps(path);
+ }
+
+
+ // Delete methods
+- public static boolean deleteAll(IPath path, String fileName) {
++ public static TFile deleteAll(IPath path, String fileName) throws IOException {
+ return deleteAll(path.append(fileName));
+ }
+- public static boolean deleteAll(IPath path) {
++ public static TFile deleteAll(IPath path) throws IOException {
+ return deleteAll(getFile(path));
+ }
+- public static boolean deleteAll(de.schlichtherle.io.File file) {
+- return file.deleteAll();
++ public static TFile deleteAll(TFile file) throws IOException {
++ return file.rm_r();
+ }
+
+ public static boolean deleteEmptyChildren(java.io.File file) {
+@@ -102,14 +107,14 @@
+
+
+ public static boolean createFolder(IPath parent, String folderName) {
+- boolean b = new de.schlichtherle.io.File(getFile(parent, ArchiveDetector.DEFAULT), folderName, ArchiveDetector.NULL).mkdirs();
++ boolean b = new de.schlichtherle.truezip.file.TFile(getFile(parent, TArchiveDetector.ALL), folderName, TArchiveDetector.NULL).mkdirs();
+ return b && updateParentTimestamps(parent.append(folderName));
+ }
+ public static boolean createFolder(IPath path) {
+ return createFolder(path.removeLastSegments(1), path.lastSegment());
+ }
+ public static boolean createArchive(IPath parent, String folderName) {
+- boolean b = new de.schlichtherle.io.File(getFile(parent, ArchiveDetector.DEFAULT), folderName, getJarArchiveDetector()).mkdirs();
++ boolean b = new de.schlichtherle.truezip.file.TFile(getFile(parent, TArchiveDetector.ALL), folderName, getJarArchiveDetector()).mkdirs();
+ return b && updateParentTimestamps(parent.append(folderName));
+ }
+ public static boolean createArchive(IPath path) {
+@@ -117,8 +122,8 @@
+ }
+ public static void umount() {
+ try {
+- de.schlichtherle.io.File.umount();
+- } catch( ArchiveException ae ) {
++ de.schlichtherle.truezip.file.TFile.umount();
++ } catch( FsSyncException ae ) {
+ }
+ }
+
+@@ -143,9 +148,9 @@
+ }
+
+ // Update only the PARENT timestamps.
+- public static boolean updateParentTimestamps(de.schlichtherle.io.File file) {
++ public static boolean updateParentTimestamps(de.schlichtherle.truezip.file.TFile file) {
+ long time = System.currentTimeMillis();
+- de.schlichtherle.io.File parent = (de.schlichtherle.io.File)file.getParentFile();
++ de.schlichtherle.truezip.file.TFile parent = (de.schlichtherle.truezip.file.TFile)file.getParentFile();
+ boolean b = true;
+ while( parent != null ) {
+ b &= parent.setLastModified(time);
+@@ -155,21 +160,22 @@
+ }
+
+
+- private static ArchiveDetector JAR_ARCHIVE_DETECTOR;
+- public static ArchiveDetector getJarArchiveDetector() {
++ private static TArchiveDetector JAR_ARCHIVE_DETECTOR;
++ public static TArchiveDetector getJarArchiveDetector() {
+ if( JAR_ARCHIVE_DETECTOR == null ) {
+- JAR_ARCHIVE_DETECTOR = new JarArchiveDetector();
++ JAR_ARCHIVE_DETECTOR = new TArchiveDetector(null);
+ }
+ return JAR_ARCHIVE_DETECTOR;
+ }
+
+- public static class JarArchiveDetector extends AbstractArchiveDetector {
+- public ArchiveDriver getArchiveDriver(String arg0) {
+- return new Zip32Driver();
++ /*
++ public static class JarArchiveDetector extends TArchiveDetector {
++ public FsArchiveDriver getArchiveDriver(String arg0) {
++ return new ZipDriver(de.schlichtherle.truezip.socket.sl.IOPoolLocator.SINGLETON);
+ }
+
+ }
+-
++ */
+
+ public static boolean javaIODeleteDir(java.io.File dir) {
+ if (dir.isDirectory()) {
diff --git a/eclipse-jbosstools-as.dmr-4.0.0.patch b/eclipse-jbosstools-as.dmr-4.0.0.patch
new file mode 100644
index 0000000..9cf4095
--- /dev/null
+++ b/eclipse-jbosstools-as.dmr-4.0.0.patch
@@ -0,0 +1,33 @@
+diff -Naur as/plugins/org.jboss.ide.eclipse.as.dmr.orig/build.properties as/plugins/org.jboss.ide.eclipse.as.dmr/build.properties
+--- as/plugins/org.jboss.ide.eclipse.as.dmr.orig/build.properties 2012-10-07 00:22:39.964058708 +0100
++++ as/plugins/org.jboss.ide.eclipse.as.dmr/build.properties 2012-10-07 00:26:00.382248466 +0100
+@@ -2,5 +2,5 @@
+ output.. = bin/
+ bin.includes = META-INF/,\
+ .,\
+- jboss-dmr-1.1.1.Final.jar,\
++ jboss-dmr.jar,\
+ build.properties
+diff -Naur as/plugins/org.jboss.ide.eclipse.as.dmr.orig/.classpath as/plugins/org.jboss.ide.eclipse.as.dmr/.classpath
+--- as/plugins/org.jboss.ide.eclipse.as.dmr.orig/.classpath 2012-10-07 00:22:39.963058726 +0100
++++ as/plugins/org.jboss.ide.eclipse.as.dmr/.classpath 2012-10-07 00:26:38.658520294 +0100
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <classpath>
+- <classpathentry exported="true" kind="lib" path="jboss-dmr-1.1.1.Final.jar"/>
++ <classpathentry exported="true" kind="lib" path="jboss-dmr.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+diff -Naur as/plugins/org.jboss.ide.eclipse.as.dmr.orig/META-INF/MANIFEST.MF as/plugins/org.jboss.ide.eclipse.as.dmr/META-INF/MANIFEST.MF
+--- as/plugins/org.jboss.ide.eclipse.as.dmr.orig/META-INF/MANIFEST.MF 2012-10-07 00:32:25.785909393 +0100
++++ as/plugins/org.jboss.ide.eclipse.as.dmr/META-INF/MANIFEST.MF 2012-10-07 00:32:38.448668089 +0100
+@@ -7,7 +7,7 @@
+ Bundle-ActivationPolicy: lazy
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Vendor: JBoss by Red Hat
+-Bundle-ClassPath: jboss-dmr-1.1.1.Final.jar,
++Bundle-ClassPath: jboss-dmr.jar,
+ .
+ Export-Package: org.jboss.dmr
+ Require-Bundle: org.eclipse.core.runtime
diff --git a/eclipse-jbosstools-as.mgmt.as71-4.0.0.patch b/eclipse-jbosstools-as.mgmt.as71-4.0.0.patch
new file mode 100644
index 0000000..74ee5e2
--- /dev/null
+++ b/eclipse-jbosstools-as.mgmt.as71-4.0.0.patch
@@ -0,0 +1,86 @@
+diff -Naur as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/build.properties as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties
+--- as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/build.properties 2012-10-07 00:35:22.664537071 +0100
++++ as/plugins/org.jboss.ide.eclipse.as.management.as71/build.properties 2012-10-07 00:37:13.043431525 +0100
+@@ -7,13 +7,13 @@
+ output.. = bin/
+ bin.includes = META-INF/,\
+ .,\
+- jboss-as-controller-client-7.1.0.Final.jar,\
+- jboss-as-protocol-7.1.0.Final.jar,\
+- jboss-dmr-1.1.1.Final.jar,\
+- jboss-logging-3.1.0.GA.jar,\
+- jboss-marshalling-1.3.9.GA.jar,\
+- jboss-sasl-1.0.0.Final.jar,\
+- jboss-threads-2.0.0.GA.jar,\
+- xnio-api-3.0.3.GA.jar,\
+- xnio-nio-3.0.3.GA.jar,\
+- jboss-remoting-3.2.7.GA.jar
++ jboss-as-controller-client.jar,\
++ jboss-as-protocol.jar,\
++ jboss-dmr.jar,\
++ jboss-logging.jar,\
++ jboss-marshalling.jar,\
++ jboss-sasl.jar,\
++ jboss-threads.jar,\
++ xnio-api.jar,\
++ xnio-nio.jar,\
++ jboss-remoting.jar
+diff -Naur as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/.classpath as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath
+--- as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/.classpath 2012-10-07 00:35:22.663537090 +0100
++++ as/plugins/org.jboss.ide.eclipse.as.management.as71/.classpath 2012-10-07 00:38:45.537659799 +0100
+@@ -1,15 +1,15 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <classpath>
+- <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.1.0.Final.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/controller-client"/>
+- <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.1.0.Final.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/protocol/src"/>
+- <classpathentry exported="true" kind="lib" path="jboss-dmr-1.1.1.Final.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-logging-3.1.0.GA.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.9.GA.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-sasl-1.0.0.Final.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.GA.jar"/>
+- <classpathentry exported="true" kind="lib" path="xnio-api-3.0.3.GA.jar"/>
+- <classpathentry exported="true" kind="lib" path="xnio-nio-3.0.3.GA.jar"/>
+- <classpathentry exported="true" kind="lib" path="jboss-remoting-3.2.7.GA.jar"/>
++ <classpathentry exported="true" kind="lib" path="jboss-as-controller-client.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/controller-client"/>
++ <classpathentry exported="true" kind="lib" path="jboss-as-protocol.jar" sourcepath="/home/rob/code/jboss/as7/jboss-as/protocol/src"/>
++ <classpathentry exported="true" kind="lib" path="jboss-dmr.jar"/>
++ <classpathentry exported="true" kind="lib" path="jboss-logging.jar"/>
++ <classpathentry exported="true" kind="lib" path="jboss-marshalling.jar"/>
++ <classpathentry exported="true" kind="lib" path="jboss-sasl.jar"/>
++ <classpathentry exported="true" kind="lib" path="jboss-threads.jar"/>
++ <classpathentry exported="true" kind="lib" path="xnio-api.jar"/>
++ <classpathentry exported="true" kind="lib" path="xnio-nio.jar"/>
++ <classpathentry exported="true" kind="lib" path="jboss-remoting.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+diff -Naur as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/META-INF/MANIFEST.MF as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF
+--- as/plugins/org.jboss.ide.eclipse.as.management.as71.orig/META-INF/MANIFEST.MF 2012-10-07 00:35:22.667537014 +0100
++++ as/plugins/org.jboss.ide.eclipse.as.management.as71/META-INF/MANIFEST.MF 2012-10-07 00:40:07.098095082 +0100
+@@ -10,16 +10,16 @@
+ Bundle-ActivationPolicy: lazy
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ClassPath: .,
+- jboss-as-controller-client-7.1.0.Final.jar,
+- jboss-as-protocol-7.1.0.Final.jar,
+- jboss-dmr-1.1.1.Final.jar,
+- jboss-logging-3.1.0.GA.jar,
+- jboss-marshalling-1.3.9.GA.jar,
+- jboss-sasl-1.0.0.Final.jar,
+- jboss-threads-2.0.0.GA.jar,
+- xnio-api-3.0.3.GA.jar,
+- xnio-nio-3.0.3.GA.jar,
+- jboss-remoting-3.2.7.GA.jar
++ jboss-as-controller-client.jar,
++ jboss-as-protocol.jar,
++ jboss-dmr.jar,
++ jboss-logging.jar,
++ jboss-marshalling.jar,
++ jboss-sasl.jar,
++ jboss-threads.jar,
++ xnio-api.jar,
++ xnio-nio.jar,
++ jboss-remoting.jar
+ Service-Component: META-INF/jboss-management-service.xml
+ Export-Package: org.jboss.ide.eclipse.as.internal.management.as71;x-friends:="org.jboss.ide.eclipse.as.management.as7.tests"
+ Bundle-Vendor: JBoss by Red Hat
diff --git a/eclipse-jbosstools.spec b/eclipse-jbosstools.spec
index 3f4fb82..3712959 100644
--- a/eclipse-jbosstools.spec
+++ b/eclipse-jbosstools.spec
@@ -1,14 +1,14 @@
%global eclipse_dropins %{_datadir}/eclipse/dropins
%global build_base build/.m2/org/jboss/tools/
-%global rls_tag Final
+%global rls_tag Alpha2
# Comma separated list of all modules that we're currently building (in order)
-%global tools parent,common,usage,archives,jmx,as,jst,cdi,ws,freemarker
+%global tools parent,common,usage,archives,jmx,runtime,as,jst,cdi,ws,freemarker
Name: eclipse-jbosstools
-Version: 3.3.1
-Release: 5%{?dist}
-Summary: A set of Eclipse plugins that supports JBoss and related technology
+Version: 4.0.0
+Release: 0.2%{?dist}
+Summary: Eclipse plugins that support JBoss and related technology
Group: Development/Tools
@@ -16,15 +16,18 @@ Group: Development/Tools
License: EPL and LGPLv2+ and ASL 2.0
URL: http://www.jboss.org/tools.html
-# svn export http://anonsvn.jboss.org/repos/jbosstools/tags/jbosstools-3.3.1.Final/ eclipse-jbosstools-3.3.1.Final
-# cp -r eclipse-jbosstools-3.3.1.Final eclipse-jbosstools-3.3.1.Final-CLEAN
-# pushd eclipse-jbosstools-3.3.1.Final-CLEAN
+# svn export \
+# http://anonsvn.jboss.org/repos/jbosstools/tags/jbosstools-4.0.0.Alpha2/ \
+# eclipse-jbosstools-4.0.0.Alpha2
+# cp -r eclipse-jbosstools-4.0.0.Alpha2 eclipse-jbosstools-4.0.0.Alpha2-CLEAN
+# pushd eclipse-jbosstools-4.0.0.Alpha2-CLEAN
# find -name *.jar -delete && find -name *.class -delete
# rm -r birt bpel central deltacloud documentation drools esb flow forge gwt \
# hibernatetools jbpm jsf maven modeshape module_template openshift portlet \
-# requirements runtime runtime-soa seam struts xulrunner
+# requirements runtime-soa seam struts xulrunner
# popd
-# tar -cJf eclipse-jbosstools-3.3.1.Final-CLEAN.tar.xz eclipse-jbosstools-3.3.1.Final-CLEAN/
+# tar -cJf eclipse-jbosstools-4.0.0.Alpha2-CLEAN.tar.xz \
+# eclipse-jbosstools-4.0.0.Alpha2-CLEAN/
Source0: %{name}-%{version}.%{rls_tag}-CLEAN.tar.xz
Source1: LICENSE-2.0.txt
@@ -35,29 +38,22 @@ Source2: lgpl-2.1.txt
Patch10: %{name}-ws-rm-requires.patch
# fix classpath entry to unversioned freemarker.jar (symlinked from _javadir)
-Patch12: %{name}-freemarker.patch
-
-# This patch seems to have been included in upstream trunk already
-# http://web.archiveorange.com/archive/v/yXYbUiLHbz40Q1bDwhSS
-Patch13: %{name}-as-methodVisibility.patch
+Patch12: %{name}-freemarker-4.0.0.patch
# Update refs from old bundled deps in archives, to symlinked deps from Fedora
-Patch14: %{name}-archives-core-manifest.patch
-Patch15: %{name}-archives-core-buildproperties.patch
+Patch14: %{name}-archives-core-manifest-4.0.0.patch
+Patch15: %{name}-archives-core-buildproperties-4.0.0.patch
# Migrate to from obselete to current version of TrueZip dependency
-Patch16: %{name}-archives-core-trueziputil.patch
+Patch16: %{name}-archives-core-trueziputil-4.0.0.patch
Patch17: %{name}-archives-core-modeltruezipbridge.patch
Patch18: %{name}-archives-core-archivesbuilder.patch
-Patch19: %{name}-as-archives.webtools.patch
-
-# Add unimplemented methods from updated jbossxb dependency
-Patch20: %{name}-archives-core-ArchivesUnmarshallerImpl.patch
+Patch19: %{name}-as-archives.webtools-4.0.0.patch
# Update refs from old bundled deps in AS, to symlinked deps from Fedora
-Patch21: %{name}-as.dmr.patch
+Patch21: %{name}-as.dmr-4.0.0.patch
Patch22: %{name}-as.core.patch
-Patch23: %{name}-as.mgmt.as71.patch
+Patch23: %{name}-as.mgmt.as71-4.0.0.patch
BuildArch: noarch
@@ -92,7 +88,6 @@ BuildRequires: java-devel
BuildRequires: jaxen >= 1.1.3
BuildRequires: jboss-as >= 7.1.1-3
BuildRequires: jboss-dmr >= 1.1.1
-BuildRequires: jbossxb >= 2.0.3
BuildRequires: jpackage-utils
BuildRequires: maven
BuildRequires: maven-jar-plugin
@@ -121,6 +116,7 @@ Requires: %{name}-freemarker = %{version}-%{release}
Requires: %{name}-jmx = %{version}-%{release}
Requires: %{name}-jst = %{version}-%{release}
Requires: %{name}-parent = %{version}-%{release}
+Requires: %{name}-runtime = %{version}-%{release}
Requires: %{name}-usage = %{version}-%{release}
Requires: %{name}-ws = %{version}-%{release}
@@ -355,6 +351,21 @@ Requires: jpackage-utils
%description freemarker
FreeMarkerIDE provides editor for FreeMarker templates
+%package runtime
+Summary: JBoss Runtime Detection
+
+Requires: %{name}-as = %{version}-%{release}
+Requires: eclipse-dtp
+Requires: eclipse-platform
+Requires: eclipse-rcp
+Requires: eclipse-swt
+Requires: eclipse-wtp-common
+Requires: java
+Requires: jpackage-utils
+
+%description runtime
+JBoss Runtime Detection
+
%prep
%setup -q -n %{name}-%{version}.%{rls_tag}-CLEAN
@@ -369,15 +380,10 @@ 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/
-ln -s %{_javadir}/concurrent.jar
-ln -s %{_javadir}/jboss-common-core.jar
-ln -s %{_javadir}/jboss-logging.jar
-ln -s %{_javadir}/jbossxb.jar
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
-ln -s %{_javadir}/xerces-j2.jar
popd
pushd as/plugins/org.jboss.ide.eclipse.as.dmr/
ln -s %{_javadir}/jboss-dmr.jar
@@ -399,9 +405,6 @@ 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.jaxrs.core/lib/
-ln -s %{_javadir}/resteasy/jaxrs-api.jar
-popd
pushd ws/plugins/org.jboss.tools.ws.ui/lib/
ln -s %{_javadir}/axis/axis.jar
ln -s %{_javadir}/axis/jaxrpc.jar
@@ -453,19 +456,19 @@ popd
%pom_disable_module site freemarker
%pom_disable_module tests freemarker
%pom_disable_module org.jboss.ide.eclipse.freemarker.test.feature freemarker/features
-
-%pom_remove_dep ant:ant-optional build/parent
+##runtime
+%pom_disable_module site runtime
+%pom_disable_module tests runtime
+%pom_disable_module org.jboss.tools.runtime.test.feature runtime/features
%patch10
%patch12
-%patch13
%patch14
%patch15
%patch16
%patch17
%patch18
%patch19
-%patch20
%patch21
%patch22
%patch23
@@ -474,6 +477,12 @@ popd
%pom_xpath_remove pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:format build/parent
%pom_xpath_inject pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration "<format>'v'yyyyMMdd-HHmm'-\${BUILD_ALIAS}-F%{fedora}'</format>" build/parent
+# Set tycho version to 0.16.0-SNAPSHOT in build/parent/pom.xml
+# and build/tycho-plugins/pom.xml
+sed -i -e 's|<tychoVersion>0.15.0</tychoVersion>|<tychoVersion>0.16.0-SNAPSHOT</tychoVersion>|g' build/parent/pom.xml
+
+sed -e 's|<tychoVersion>0.15.0</tychoVersion>|<tychoVersion>0.16.0-SNAPSHOT</tychoVersion>|g' build/tycho-plugins/pom.xml
+
%build
# Build everything from within build
@@ -496,7 +505,7 @@ pushd parent/*-SNAPSHOT/
%add_maven_depmap JPP-%{name}-parent.pom -f parent
popd
-for tool in common usage archives jmx as jst cdi ws freemarker; do
+for tool in common usage archives jmx as jst cdi ws freemarker runtime; do
install -d -m 755 %{buildroot}%{eclipse_dropins}/%{name}-${tool}/eclipse/features
install -d -m 755 %{buildroot}%{eclipse_dropins}/%{name}-${tool}/eclipse/plugins
@@ -596,8 +605,21 @@ popd;
%{_mavenpomdir}/JPP-%{name}-freemarker.pom
%{_mavendepmapfragdir}/%{name}-freemarker
+%files runtime
+%{eclipse_dropins}/%{name}-runtime
+%{_mavenpomdir}/JPP-%{name}-runtime.pom
+%{_mavendepmapfragdir}/%{name}-runtime
+
%changelog
+* 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.
+- Shorten summary line.
+- Rebase patches 14, 15, 16, 21, 23; append -4.0.0 to patch name.
+- Remove patches 13, 20.
+- Remove dependency on jbossxb.
+
* Mon Oct 08 2012 Gerard Ryan <galileo at fedoraproject.org> - 3.3.1-5
- Build as a noarch package.
More information about the scm-commits
mailing list