[jboss-as] Rebasing patches
Marek Goldmann
goldmann at fedoraproject.org
Tue Dec 4 13:58:23 UTC 2012
commit e20abe0f1b51eb55661b485f220932f0cb66c462
Author: Marek Goldmann <mgoldman at redhat.com>
Date: Tue Dec 4 14:57:02 2012 +0100
Rebasing patches
...-NOT-UPSTREAM-an-ugly-patch-to-remove-IIO.patch | 887 --------------------
...e.patch => 0001-fedora-Disable-checkstyle.patch | 6 +-
...d-standalone-web.xml-example-configuratio.patch | 41 +-
...-files-re-arrange-directory-with-init-scr.patch | 41 +-
0003-Fix-initd-script.patch | 30 -
...OME-when-jboss-cli.sh-is-executed-through.patch | 6 +-
...OSS_BASE_DIR-is-checked-in-standalone.sh-.patch | 6 +-
...h => 0006-fedora-Remove-activation-module.patch | 16 +-
...007-Use-properties-in-add-user-AS7-module.patch | 2 +-
...rt-for-overriding-the-user-and-roles-prop.patch | 11 +-
...d-user.sh-mangles-permissions-of-mgmt-use.patch | 2 +-
...S7-4286-Fix-JavaCC-grammars-for-version-5.patch | 2 +-
...ve-jasper-jdt-requirement-it-was-replaced.patch | 80 ++
...emoved-unused-import-in-modcluster-module.patch | 2 +-
...er-jdt-requirement-it-was-replaced-by-ecj.patch | 54 --
...ora-Remove-org.osgi.enterprise-dependency.patch | 12 +-
0014-Disable-still-not-available-modules.patch | 23 -
...-some-enforcer-exclusions-these-are-alias.patch | 18 +-
...ve-jbossweb-native-dependency.-We-ll-have.patch | 8 +-
...edora-Disable-checkstyle-in-testsuite-too.patch | 4 +-
...s.patch => 0017-fedora-Disable-testsuites.patch | 16 +-
0018-Disable-Hibernate.patch | 38 -
...18-fedora-Make-AS7-work-with-jython-2.2.1.patch | 4 +-
...jtype-dependency-to-hibernate-validator-t.patch | 15 +-
...che.openjpa-module.-This-allows-to-use-th.patch | 28 +-
...enting-out-still-unavailable-dependencies.patch | 615 --------------
...=> 0021-fedora-Add-org.hibernate.3-module.patch | 46 +-
...org.osgi-org.osgi.compendium-dependency-s.patch | 25 +-
0023-Added-org.jboss.as.jdr-module.patch | 97 ---
...dd-methods-for-creating-a-test-https-conn.patch | 2 +-
...d-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch | 76 ++-
...ve-javax.jws.api.-This-is-part-of-the-JDK.patch | 63 +-
...sion-requirement-for-org.eclipse.jdt-core.patch | 34 -
...ing-module-dependencies-in-mime4j-com.sun.patch | 61 +-
...-the-org.jboss.as.web-module-to-be-able-t.patch | 22 -
...ve-still-unavailable-in-Fedora-dependenci.patch | 177 ++++
...pleDS-H2-datasource-to-standalone-web.xml.patch | 35 -
...ot-extract-jbossweb-native-it-s-symlinked.patch | 23 +
...le-jpa-openjpa-and-jpa-hibernate3-modules.patch | 99 ---
...3724-DO-NOT-UPSTREAM-an-ugly-patch-to-rem.patch | 872 -------------------
0034-Enable-jbossxb-module.patch | 26 -
0035-Added-org.jboss.as.xts-module.patch | 88 --
0036-Add-support-for-Hibernate-4.patch | 115 ---
0038-Disable-jbossws-native-usage.patch | 34 -
0039-Enabled-webservices-related-moduled.patch | 217 -----
0042-Revert-Disable-jbossws-native-usage.patch | 35 -
...sws-native-remove-javax.jws.api-from-cxf-.patch | 77 --
...lone.xml-the-default-configuration-instea.patch | 20 -
...-way-to-override-the-default-bind-address.patch | 36 -
jboss-as.spec | 82 +-
50 files changed, 606 insertions(+), 3723 deletions(-)
---
diff --git a/0002-Disable-checkstyle.patch b/0001-fedora-Disable-checkstyle.patch
similarity index 94%
rename from 0002-Disable-checkstyle.patch
rename to 0001-fedora-Disable-checkstyle.patch
index f3a0a53..3515349 100644
--- a/0002-Disable-checkstyle.patch
+++ b/0001-fedora-Disable-checkstyle.patch
@@ -1,14 +1,14 @@
-From c58d3127467dfb10fc7b534757af4eca8801e2ef Mon Sep 17 00:00:00 2001
+From 932d2910447d9461e59de20b2e534b71e7ab7e16 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann at fedoraproject.org>
Date: Thu, 26 Jan 2012 08:58:21 -0500
-Subject: [PATCH] Disable checkstyle
+Subject: [PATCH] [fedora] Disable checkstyle
---
pom.xml | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/pom.xml b/pom.xml
-index c4ea094..a9336c4 100644
+index 390e45e..036f99e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,10 +309,6 @@
diff --git a/0004-Added-standalone-web.xml-example-configuration.-Use-.patch b/0002-fedora-Added-standalone-web.xml-example-configuratio.patch
similarity index 91%
rename from 0004-Added-standalone-web.xml-example-configuration.-Use-.patch
rename to 0002-fedora-Added-standalone-web.xml-example-configuratio.patch
index feb2fea..9b00182 100644
--- a/0004-Added-standalone-web.xml-example-configuration.-Use-.patch
+++ b/0002-fedora-Added-standalone-web.xml-example-configuratio.patch
@@ -1,31 +1,19 @@
-From e202e453392cb15a9ee8acf8b90b1023120d5c17 Mon Sep 17 00:00:00 2001
+From 22d4ac2828eb48d22ae20f7218ed98f01fab4489 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Wed, 4 Apr 2012 15:06:07 +0200
-Subject: [PATCH] Added standalone-web.xml example configuration. Use this by
- default in Fedora.
+Subject: [PATCH] [fedora] Added standalone-web.xml example configuration.
---
- build/src/main/resources/bin/init.d/jboss-as.conf | 2 +-
- .../docs/examples/configs/standalone-web.xml | 227 +++++++++++++++++++++
- 2 files changed, 228 insertions(+), 1 deletion(-)
+ .../docs/examples/configs/standalone-web.xml | 242 +++++++++++++++++++++
+ 1 file changed, 242 insertions(+)
create mode 100644 build/src/main/resources/docs/examples/configs/standalone-web.xml
-diff --git a/build/src/main/resources/bin/init.d/jboss-as.conf b/build/src/main/resources/bin/init.d/jboss-as.conf
-index 72a356b..cbe4aa7 100644
---- a/build/src/main/resources/bin/init.d/jboss-as.conf
-+++ b/build/src/main/resources/bin/init.d/jboss-as.conf
-@@ -19,4 +19,4 @@ JBOSS_USER=jboss-as
-
- # The configuration you want to run
- #
--JBOSS_CONFIG=standalone-minimalistic.xml
-+JBOSS_CONFIG=standalone-web.xml
diff --git a/build/src/main/resources/docs/examples/configs/standalone-web.xml b/build/src/main/resources/docs/examples/configs/standalone-web.xml
new file mode 100644
-index 0000000..02074d2
+index 0000000..73276bc
--- /dev/null
+++ b/build/src/main/resources/docs/examples/configs/standalone-web.xml
-@@ -0,0 +1,227 @@
+@@ -0,0 +1,242 @@
+<?xml version="1.0" ?>
+
+<server xmlns="urn:jboss:domain:1.1">
@@ -100,6 +88,21 @@ index 0000000..02074d2
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:datasources:1.0">
++ <datasources>
++ <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
++ <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
++ <driver>h2</driver>
++ <security>
++ <user-name>sa</user-name>
++ <password>sa</password>
++ </security>
++ </datasource>
++ <drivers>
++ <driver name="h2" module="com.h2database.h2">
++ <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
++ </driver>
++ </drivers>
++ </datasources>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.1">
+ <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" auto-deploy-zipped="false"/>
@@ -238,7 +241,7 @@ index 0000000..02074d2
+ <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+ </interface>
+ <interface name="public">
-+ <inet-address value="${jboss.bind.address:0.0.0.0}"/>
++ <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+ </interface>
+ </interfaces>
+
diff --git a/0005-Add-systemd-files-re-arrange-directory-with-init-scr.patch b/0003-Add-systemd-files-re-arrange-directory-with-init-scr.patch
similarity index 94%
rename from 0005-Add-systemd-files-re-arrange-directory-with-init-scr.patch
rename to 0003-Add-systemd-files-re-arrange-directory-with-init-scr.patch
index 1d0a637..fb0b091 100644
--- a/0005-Add-systemd-files-re-arrange-directory-with-init-scr.patch
+++ b/0003-Add-systemd-files-re-arrange-directory-with-init-scr.patch
@@ -1,17 +1,17 @@
-From 9c880056d9e84eba74c83542db12101979475c6e Mon Sep 17 00:00:00 2001
+From 82740dd1ac26c87969cf9320af9167fdb819e04d Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Wed, 4 Apr 2012 15:30:43 +0200
Subject: [PATCH] Add systemd files, re-arrange directory with init scripts
---
.../resources/bin/init.d/jboss-as-standalone.sh | 175 --------------------
- build/src/main/resources/bin/init.d/jboss-as.conf | 22 ---
- .../bin/initscripts/systemd/jboss-as.conf | 4 +
+ build/src/main/resources/bin/init.d/jboss-as.conf | 18 ---
+ .../bin/initscripts/systemd/jboss-as.conf | 8 +
.../bin/initscripts/systemd/jboss-as.service | 17 ++
- .../resources/bin/initscripts/sysv/jboss-as.conf | 22 +++
+ .../resources/bin/initscripts/sysv/jboss-as.conf | 19 +++
.../resources/bin/initscripts/sysv/jboss-as.sh | 176 +++++++++++++++++++++
build/src/main/resources/bin/standalone.sh | 4 +
- 7 files changed, 223 insertions(+), 197 deletions(-)
+ 7 files changed, 224 insertions(+), 193 deletions(-)
delete mode 100755 build/src/main/resources/bin/init.d/jboss-as-standalone.sh
delete mode 100644 build/src/main/resources/bin/init.d/jboss-as.conf
create mode 100644 build/src/main/resources/bin/initscripts/systemd/jboss-as.conf
@@ -202,16 +202,16 @@ index 7b91e90..0000000
-esac
diff --git a/build/src/main/resources/bin/init.d/jboss-as.conf b/build/src/main/resources/bin/init.d/jboss-as.conf
deleted file mode 100644
-index cbe4aa7..0000000
+index 0bfc942..0000000
--- a/build/src/main/resources/bin/init.d/jboss-as.conf
+++ /dev/null
-@@ -1,22 +0,0 @@
+@@ -1,18 +0,0 @@
-# General configuration for the init.d scripts,
-# not necessarily for JBoss AS itself.
-
-# The username who should own the process.
-#
--JBOSS_USER=jboss-as
+-# JBOSS_USER=jboss-as
-
-# The amount of time to wait for startup
-#
@@ -224,23 +224,23 @@ index cbe4aa7..0000000
-# Location to keep the console log
-#
-# JBOSS_CONSOLE_LOG=/var/log/jboss-as/console.log
--
--# The configuration you want to run
--#
--JBOSS_CONFIG=standalone-web.xml
diff --git a/build/src/main/resources/bin/initscripts/systemd/jboss-as.conf b/build/src/main/resources/bin/initscripts/systemd/jboss-as.conf
new file mode 100644
-index 0000000..82699ad
+index 0000000..20f2780
--- /dev/null
+++ b/build/src/main/resources/bin/initscripts/systemd/jboss-as.conf
-@@ -0,0 +1,4 @@
+@@ -0,0 +1,8 @@
+# The configuration you want to run
+#
-+JBOSS_CONFIG=standalone-web.xml
++JBOSS_CONFIG=standalone.xml
++
++# The address to bind to
++#
++JBOSS_BIND=0.0.0.0
+
diff --git a/build/src/main/resources/bin/initscripts/systemd/jboss-as.service b/build/src/main/resources/bin/initscripts/systemd/jboss-as.service
new file mode 100644
-index 0000000..32c1c10
+index 0000000..1a546cc
--- /dev/null
+++ b/build/src/main/resources/bin/initscripts/systemd/jboss-as.service
@@ -0,0 +1,17 @@
@@ -255,7 +255,7 @@ index 0000000..32c1c10
+User=jboss-as
+LimitNOFILE=102642
+PIDFile=/var/run/jboss-as/jboss-as.pid
-+ExecStart=/usr/share/jboss-as/bin/standalone.sh -c $JBOSS_CONFIG
++ExecStart=/usr/share/jboss-as/bin/standalone.sh -c $JBOSS_CONFIG -b $JBOSS_BIND
+StandardOutput=null
+
+[Install]
@@ -263,13 +263,10 @@ index 0000000..32c1c10
+
diff --git a/build/src/main/resources/bin/initscripts/sysv/jboss-as.conf b/build/src/main/resources/bin/initscripts/sysv/jboss-as.conf
new file mode 100644
-index 0000000..d999aca
+index 0000000..d4a3125
--- /dev/null
+++ b/build/src/main/resources/bin/initscripts/sysv/jboss-as.conf
-@@ -0,0 +1,22 @@
-+# General configuration for the init.d scripts,
-+# not necessarily for JBoss AS itself.
-+
+@@ -0,0 +1,19 @@
+# The username who should own the process.
+#
+# JBOSS_USER=jboss-as
diff --git a/0006-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch b/0004-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
similarity index 90%
rename from 0006-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
rename to 0004-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
index e8ddf7d..73537b3 100644
--- a/0006-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
+++ b/0004-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
@@ -1,8 +1,8 @@
-From 02794660bf30d4aa4093430da79a5886aa34ad7b Mon Sep 17 00:00:00 2001
+From 3150aa1304b8d60cef88105bc8908b29235bbe7c Mon Sep 17 00:00:00 2001
From: Patryk Obara <dreamer.tan at gmail.com>
Date: Thu, 5 Apr 2012 18:42:05 +0200
-Subject: [PATCH] Fix JBOSS_HOME when jboss-cli.sh is executed through
- symbolic link
+Subject: [PATCH] Fix JBOSS_HOME when jboss-cli.sh is executed through symbolic
+ link
---
build/src/main/resources/bin/jboss-cli.sh | 8 +++++++-
diff --git a/0007-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch b/0005-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
similarity index 90%
rename from 0007-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
rename to 0005-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
index 6c1b302..7c9f6ee 100644
--- a/0007-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
+++ b/0005-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
@@ -1,8 +1,8 @@
-From 690b3b52e339491110168b97cf792152f7dcf3c5 Mon Sep 17 00:00:00 2001
+From 07fe7c15187d8a9facd94cf06f428cb539055ba9 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Thu, 5 Apr 2012 16:10:47 +0200
-Subject: [PATCH] [AS7-3800] JBOSS_BASE_DIR is checked in standalone.sh but
- not used to set -Djboss.server.base.dir
+Subject: [PATCH] [AS7-3800] JBOSS_BASE_DIR is checked in standalone.sh but not
+ used to set -Djboss.server.base.dir
---
build/src/main/resources/bin/standalone.sh | 2 ++
diff --git a/0008-Remove-activation-module.patch b/0006-fedora-Remove-activation-module.patch
similarity index 97%
rename from 0008-Remove-activation-module.patch
rename to 0006-fedora-Remove-activation-module.patch
index 3026bd9..43fca6a 100644
--- a/0008-Remove-activation-module.patch
+++ b/0006-fedora-Remove-activation-module.patch
@@ -1,7 +1,7 @@
-From 1f913d56bd0c7e4ad7a12c811c0c73a8eefde61e Mon Sep 17 00:00:00 2001
+From 0b523b7c677095789b8df1ddc655a9080aad8fea Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Mon, 16 Apr 2012 17:45:12 +0200
-Subject: [PATCH] Remove activation module
+Subject: [PATCH] [fedora] Remove activation module
---
build/build.xml | 4 ---
@@ -21,7 +21,7 @@ Subject: [PATCH] Remove activation module
delete mode 100644 build/src/main/resources/modules/javax/activation/api/main/module.xml
diff --git a/build/build.xml b/build/build.xml
-index 4c56cf3..762830d 100644
+index 0a0ce06..0679d4d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -340,10 +340,6 @@
@@ -36,11 +36,11 @@ index 4c56cf3..762830d 100644
<maven-resource group="org.jboss.spec.javax.annotation" artifact="jboss-annotations-api_1.1_spec"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 5bc6527..b3f1a2e 100644
+index dfc91a9..86f4868 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -300,11 +300,6 @@
- -->
+@@ -298,11 +298,6 @@
+ </dependency>
<dependency>
- <groupId>javax.activation</groupId>
@@ -225,7 +225,7 @@ index 0c06cc0..4f821ff 100644
<module name="org.apache.commons.codec" />
<module name="org.apache.httpcomponents" />
diff --git a/pom.xml b/pom.xml
-index a9336c4..800fcd7 100644
+index 036f99e..686a609 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,6 @@
@@ -236,7 +236,7 @@ index a9336c4..800fcd7 100644
<version.javax.enterprise>1.0-SP4</version.javax.enterprise>
<version.javax.faces.jsf-api.1.2>1.2_15-jbossorg-2</version.javax.faces.jsf-api.1.2>
<version.javax.faces.jsf-impl>2.1.7-jbossorg-2</version.javax.faces.jsf-impl>
-@@ -1299,12 +1298,6 @@
+@@ -1298,12 +1297,6 @@
</dependency>
<dependency>
diff --git a/0009-Use-properties-in-add-user-AS7-module.patch b/0007-Use-properties-in-add-user-AS7-module.patch
similarity index 99%
rename from 0009-Use-properties-in-add-user-AS7-module.patch
rename to 0007-Use-properties-in-add-user-AS7-module.patch
index 98ad8c0..7ffb44e 100644
--- a/0009-Use-properties-in-add-user-AS7-module.patch
+++ b/0007-Use-properties-in-add-user-AS7-module.patch
@@ -1,4 +1,4 @@
-From 0ed08613fbf5f1d026309b4ce8896bc380311759 Mon Sep 17 00:00:00 2001
+From a5b1c5e3bb08f46938266b428f65d3b6d6bc1fa7 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Mon, 16 Apr 2012 18:23:15 +0200
Subject: [PATCH] Use properties in add-user AS7 module
diff --git a/0010-added-support-for-overriding-the-user-and-roles-prop.patch b/0008-added-support-for-overriding-the-user-and-roles-prop.patch
similarity index 98%
rename from 0010-added-support-for-overriding-the-user-and-roles-prop.patch
rename to 0008-added-support-for-overriding-the-user-and-roles-prop.patch
index b942e56..e7efc48 100644
--- a/0010-added-support-for-overriding-the-user-and-roles-prop.patch
+++ b/0008-added-support-for-overriding-the-user-and-roles-prop.patch
@@ -1,12 +1,11 @@
-From e4aa48a19be0a587962e5d75f47c9f7f735c6f79 Mon Sep 17 00:00:00 2001
+From be4f9660c1f648dffab2d6bdf01461cdb8df5da8 Mon Sep 17 00:00:00 2001
From: "flemming.harms at gmail.com" <flemming.harms at gmail.com>
Date: Wed, 11 Apr 2012 21:00:27 +0200
Subject: [PATCH] added support for overriding the user and roles property
- files for both the standalone and domain server mode.
- Specify the system property jboss.server.config.user.dir to
- overriding the location for standalone user files and the
- property jboss.domain.config.user.dir for overiding the
- location for domain mode
+ files for both the standalone and domain server mode. Specify the system
+ property jboss.server.config.user.dir to overriding the location for
+ standalone user files and the property jboss.domain.config.user.dir for
+ overiding the location for domain mode
---
build/src/main/resources/bin/add-user.bat | 5 +-
diff --git a/0011-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch b/0009-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
similarity index 98%
rename from 0011-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
rename to 0009-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
index 0d79567..cf91d17 100644
--- a/0011-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
+++ b/0009-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
@@ -1,4 +1,4 @@
-From e4eb19be3408a137d08942feddd569f8cf70ce73 Mon Sep 17 00:00:00 2001
+From 4d8844f58d8946ca9c5e08ecf87172868a2e47c2 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Tue, 17 Apr 2012 13:56:43 +0200
Subject: [PATCH] [AS7-4536] add-user.sh mangles permissions of
diff --git a/0012-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch b/0010-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
similarity index 98%
rename from 0012-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
rename to 0010-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
index 3284763..f09a119 100644
--- a/0012-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
+++ b/0010-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
@@ -1,4 +1,4 @@
-From 43ed974a5aa06624a6d1b58bf5821689d61e2c46 Mon Sep 17 00:00:00 2001
+From ddf3eab527bd6b0cbea84c6ba97fec09d8eee7ac Mon Sep 17 00:00:00 2001
From: Juan Hernandez <juan.hernandez at redhat.com>
Date: Wed, 8 Feb 2012 16:22:56 +0100
Subject: [PATCH] [AS7-4286] Fix JavaCC grammars for version 5.
diff --git a/0011-fedora-Remove-jasper-jdt-requirement-it-was-replaced.patch b/0011-fedora-Remove-jasper-jdt-requirement-it-was-replaced.patch
new file mode 100644
index 0000000..8fb248c
--- /dev/null
+++ b/0011-fedora-Remove-jasper-jdt-requirement-it-was-replaced.patch
@@ -0,0 +1,80 @@
+From 9c18486d87228a5d576f1344abd83fa7a900ee28 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Tue, 19 Jun 2012 10:28:33 +0200
+Subject: [PATCH] [fedora] Remove jasper-jdt requirement, it was replaced by
+ org.eclipse.jdt:core provided by ecj in Fedora
+
+---
+ build/build.xml | 2 +-
+ build/pom.xml | 4 ++--
+ pom.xml | 6 +++---
+ web/pom.xml | 4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 0679d4d..844e4d0 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -864,7 +864,7 @@
+
+ <module-def name="org.jboss.as.web">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-web"/>
+- <maven-resource group="org.jboss.web" artifact="jasper-jdt"/>
++ <maven-resource group="org.eclipse.jdt" artifact="core"/>
+ <maven-resource group="org.jboss.web" artifact="jbossweb"/>
+ <extract-native-jar group="org.jboss.as" artifact="jbossweb-native"/>
+ </module-def>
+diff --git a/build/pom.xml b/build/pom.xml
+index 86f4868..587be3d 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -1454,8 +1454,8 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.jboss.web</groupId>
+- <artifactId>jasper-jdt</artifactId>
++ <groupId>org.eclipse.jdt</groupId>
++ <artifactId>core</artifactId>
+ </dependency>
+
+ <dependency>
+diff --git a/pom.xml b/pom.xml
+index 686a609..58abe94 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -217,7 +217,7 @@
+ <version.org.jboss.stdio>1.0.1.GA</version.org.jboss.stdio>
+ <version.org.jboss.threads>2.0.0.GA</version.org.jboss.threads>
+ <version.org.jboss.web>7.0.13.Final</version.org.jboss.web>
+- <version.org.jboss.web.jasper-jdt>7.0.3.Final</version.org.jboss.web.jasper-jdt>
++ <version.org.jboss.web.jasper-jdt>3.3.0</version.org.jboss.web.jasper-jdt>
+ <version.org.jboss.weld.weld>1.1.5.AS71.Final</version.org.jboss.weld.weld>
+ <version.org.jboss.weld.weld-api>1.1.Final</version.org.jboss.weld.weld-api>
+ <version.org.jboss.ws.api>1.0.0.GA</version.org.jboss.ws.api>
+@@ -4972,8 +4972,8 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.jboss.web</groupId>
+- <artifactId>jasper-jdt</artifactId>
++ <groupId>org.eclipse.jdt</groupId>
++ <artifactId>core</artifactId>
+ <version>${version.org.jboss.web.jasper-jdt}</version>
+ </dependency>
+
+diff --git a/web/pom.xml b/web/pom.xml
+index d336f0d..ebd0b01 100644
+--- a/web/pom.xml
++++ b/web/pom.xml
+@@ -144,8 +144,8 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.jboss.web</groupId>
+- <artifactId>jasper-jdt</artifactId>
++ <groupId>org.eclipse.jdt</groupId>
++ <artifactId>core</artifactId>
+ </dependency>
+
+ <dependency>
diff --git a/0015-Removed-unused-import-in-modcluster-module.patch b/0012-Removed-unused-import-in-modcluster-module.patch
similarity index 93%
rename from 0015-Removed-unused-import-in-modcluster-module.patch
rename to 0012-Removed-unused-import-in-modcluster-module.patch
index 9e56502..1a01a9a 100644
--- a/0015-Removed-unused-import-in-modcluster-module.patch
+++ b/0012-Removed-unused-import-in-modcluster-module.patch
@@ -1,4 +1,4 @@
-From 62edea479114cd7efdd84fed98606b0c53d628e3 Mon Sep 17 00:00:00 2001
+From cbf0caa26e6441e9b604131f61436cb0a6d824b5 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Tue, 19 Jun 2012 11:04:02 +0200
Subject: [PATCH] Removed unused import in modcluster module
diff --git a/0016-Remove-org.osgi.enterprise-dependency.patch b/0013-fedora-Remove-org.osgi.enterprise-dependency.patch
similarity index 90%
rename from 0016-Remove-org.osgi.enterprise-dependency.patch
rename to 0013-fedora-Remove-org.osgi.enterprise-dependency.patch
index 59f6092..38bd58b 100644
--- a/0016-Remove-org.osgi.enterprise-dependency.patch
+++ b/0013-fedora-Remove-org.osgi.enterprise-dependency.patch
@@ -1,7 +1,7 @@
-From fe01d291b864a085aa29f15b409c40063f689968 Mon Sep 17 00:00:00 2001
+From d628c52f64025c4a4a58ac965d8e549e5e4efb2c Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Tue, 19 Jun 2012 11:16:40 +0200
-Subject: [PATCH] Remove org.osgi.enterprise dependency
+Subject: [PATCH] [fedora] Remove org.osgi.enterprise dependency
---
build/pom.xml | 5 -----
@@ -11,10 +11,10 @@ Subject: [PATCH] Remove org.osgi.enterprise dependency
4 files changed, 19 deletions(-)
diff --git a/build/pom.xml b/build/pom.xml
-index e9381fd..a1c82e8 100644
+index 587be3d..ca99da8 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -1583,11 +1583,6 @@
+@@ -1575,11 +1575,6 @@
</dependency>
<dependency>
@@ -42,10 +42,10 @@ index f20f5be..338da61 100644
<!-- Test Dependencies -->
<dependency>
diff --git a/pom.xml b/pom.xml
-index ae8ca34..c613f00 100644
+index 58abe94..a7e6ee8 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -5633,12 +5633,6 @@
+@@ -5632,12 +5632,6 @@
</dependency>
<dependency>
diff --git a/0017-Drop-some-enforcer-exclusions-these-are-aliases-in-F.patch b/0014-fedora-Drop-some-enforcer-exclusions-these-are-alias.patch
similarity index 74%
rename from 0017-Drop-some-enforcer-exclusions-these-are-aliases-in-F.patch
rename to 0014-fedora-Drop-some-enforcer-exclusions-these-are-alias.patch
index 5556a5b..a5fe1bc 100644
--- a/0017-Drop-some-enforcer-exclusions-these-are-aliases-in-F.patch
+++ b/0014-fedora-Drop-some-enforcer-exclusions-these-are-alias.patch
@@ -1,14 +1,15 @@
-From 79965aee34da1fdffa6c7b774b829c999b8303d3 Mon Sep 17 00:00:00 2001
+From ae9a0d13916a01d6fb84982f6d89e5db27a6bb83 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Tue, 19 Jun 2012 11:37:29 +0200
-Subject: [PATCH] Drop some enforcer exclusions, these are aliases in Fedora
+Subject: [PATCH] [fedora] Drop some enforcer exclusions, these are aliases in
+ Fedora
---
- pom.xml | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ pom.xml | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
-index c613f00..3691619 100644
+index a7e6ee8..877b810 100644
--- a/pom.xml
+++ b/pom.xml
@@ -391,11 +391,11 @@
@@ -25,7 +26,12 @@ index c613f00..3691619 100644
<exclude>jboss:jboss-logging-spi</exclude>
<exclude>jboss:jboss-serialization</exclude>
<exclude>jboss.web:el-api</exclude>
-@@ -447,7 +447,7 @@
+@@ -442,11 +442,11 @@
+ <exclude>org.slf4j:slf4j-log4j12</exclude>
+ <exclude>org.slf4j:slf4j-log4j13</exclude>
+ <exclude>oro:oro</exclude>
+- <exclude>stax:stax-api</exclude>
++ <!-- <exclude>stax:stax-api</exclude> alias in Fedora -->
<exclude>sun-jaxb:jaxb-api</exclude>
<exclude>trove:trove</exclude>
<exclude>woodstox:wstx-lgpl</exclude>
diff --git a/0019-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch b/0015-fedora-Remove-jbossweb-native-dependency.-We-ll-have.patch
similarity index 72%
rename from 0019-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch
rename to 0015-fedora-Remove-jbossweb-native-dependency.-We-ll-have.patch
index 75dd5e6..433f38d 100644
--- a/0019-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch
+++ b/0015-fedora-Remove-jbossweb-native-dependency.-We-ll-have.patch
@@ -1,15 +1,15 @@
-From 4d64b44f3f247d5fa35e0ed13902903ffaa9a490 Mon Sep 17 00:00:00 2001
+From 12a187b40dc4188202ba3f1ee4b9a3b84ee35995 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Tue, 19 Jun 2012 12:07:28 +0200
-Subject: [PATCH] Remove jbossweb-native dependency. We'll have unpackaged .so
- files in jboss-web-native package
+Subject: [PATCH] [fedora] Remove jbossweb-native dependency. We'll have
+ unpackaged .so files in jboss-web-native package
---
build/pom.xml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/build/pom.xml b/build/pom.xml
-index a1c82e8..bc6078e 100644
+index ca99da8..a3af398 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -144,11 +144,6 @@
diff --git a/0021-Disable-checkstyle-in-testsuite-too.patch b/0016-fedora-Disable-checkstyle-in-testsuite-too.patch
similarity index 92%
rename from 0021-Disable-checkstyle-in-testsuite-too.patch
rename to 0016-fedora-Disable-checkstyle-in-testsuite-too.patch
index 17e4cf2..e0ca9b7 100644
--- a/0021-Disable-checkstyle-in-testsuite-too.patch
+++ b/0016-fedora-Disable-checkstyle-in-testsuite-too.patch
@@ -1,7 +1,7 @@
-From 2fcfcab5556e34c3a1a5093715f0a3ee55541754 Mon Sep 17 00:00:00 2001
+From 284fd9eb134ad751477e51e9270336814ac066e3 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Tue, 19 Jun 2012 17:32:34 +0200
-Subject: [PATCH] Disable checkstyle in testsuite too
+Subject: [PATCH] [fedora] Disable checkstyle in testsuite too
---
testsuite/shared/pom.xml | 29 -----------------------------
diff --git a/0022-Disable-testsuites.patch b/0017-fedora-Disable-testsuites.patch
similarity index 59%
rename from 0022-Disable-testsuites.patch
rename to 0017-fedora-Disable-testsuites.patch
index d2afa09..4471692 100644
--- a/0022-Disable-testsuites.patch
+++ b/0017-fedora-Disable-testsuites.patch
@@ -1,21 +1,21 @@
-From 15708bab207d1e0883d82c8c01d734e84997245c Mon Sep 17 00:00:00 2001
+From 037b03aace50b0d1c3df6f1c9a5f9b4a1a2b4b70 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Tue, 19 Jun 2012 18:55:42 +0200
-Subject: [PATCH] Disable testsuites
+Subject: [PATCH] [fedora] Disable testsuites
---
- pom.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ pom.xml | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/pom.xml b/pom.xml
-index 3691619..aaef12a 100644
+index 877b810..b131778 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -5985,9 +5985,9 @@
+@@ -5979,8 +5979,10 @@
+ <module>webservices</module>
<module>weld</module>
- <!--
<module>xts</module>
-- -->
++ <!--
<module>testsuite/shared</module>
<module>testsuite</module>
+ -->
diff --git a/0024-Make-AS7-work-with-jython-2.2.1.patch b/0018-fedora-Make-AS7-work-with-jython-2.2.1.patch
similarity index 90%
rename from 0024-Make-AS7-work-with-jython-2.2.1.patch
rename to 0018-fedora-Make-AS7-work-with-jython-2.2.1.patch
index de904ca..94a9655 100644
--- a/0024-Make-AS7-work-with-jython-2.2.1.patch
+++ b/0018-fedora-Make-AS7-work-with-jython-2.2.1.patch
@@ -1,7 +1,7 @@
-From 0ea25332cc07ae5bd27401ad87b68221e4be00ca Mon Sep 17 00:00:00 2001
+From 757c349023c97f1af0a48465982e9a53045b4e17 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Wed, 20 Jun 2012 15:37:16 +0200
-Subject: [PATCH] Make AS7 work with jython 2.2.1
+Subject: [PATCH] [fedora] Make AS7 work with jython 2.2.1
---
jdr/jboss-as-jdr/src/main/java/org/jboss/as/jdr/SoSReport.java | 7 ++++++-
diff --git a/0029-Add-jtype-dependency-to-hibernate-validator-to-fix-t.patch b/0019-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
similarity index 93%
rename from 0029-Add-jtype-dependency-to-hibernate-validator-to-fix-t.patch
rename to 0019-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
index cbbe78c..556f6b6 100644
--- a/0029-Add-jtype-dependency-to-hibernate-validator-to-fix-t.patch
+++ b/0019-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
@@ -1,9 +1,8 @@
-From bba49ebafcb78aa51fcffe5bd45ef7074b0338f3 Mon Sep 17 00:00:00 2001
+From 76237967d691b6eb75460c80741aa15db4d93cd3 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Wed, 22 Aug 2012 11:23:43 +0200
-Subject: [PATCH] Add jtype dependency to hibernate-validator to fix the
- java.lang.NoClassDefFoundError:
- com/googlecode/jtype/TypeUtils exception
+Subject: [PATCH] [fedora] Add jtype dependency to hibernate-validator to fix
+ the java.lang.NoClassDefFoundError: com/googlecode/jtype/TypeUtils exception
---
build/build.xml | 4 +++
@@ -15,7 +14,7 @@ Subject: [PATCH] Add jtype dependency to hibernate-validator to fix the
create mode 100644 build/src/main/resources/modules/com/googlecode/jtype/main/module.xml
diff --git a/build/build.xml b/build/build.xml
-index a340620..ced3d78 100644
+index 844e4d0..78cb0ec 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -309,6 +309,10 @@
@@ -30,7 +29,7 @@ index a340620..ced3d78 100644
<maven-resource group="com.h2database" artifact="h2"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 1541a0e..3adb3f0 100644
+index a3af398..2ccc648 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -223,6 +223,11 @@
@@ -96,7 +95,7 @@ index 744d153..77b8c99 100644
<module name="javax.persistence.api"/>
<module name="javax.validation.api"/>
diff --git a/pom.xml b/pom.xml
-index f4ce7b5..e398654 100644
+index b131778..c3d3169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,7 @@
@@ -107,7 +106,7 @@ index f4ce7b5..e398654 100644
<version.com.h2database>1.3.161</version.com.h2database>
<version.dom4j>1.6.1</version.dom4j>
<version.gnu.getopt>1.0.13</version.gnu.getopt>
-@@ -1174,6 +1175,12 @@
+@@ -1173,6 +1174,12 @@
</dependency>
<dependency>
diff --git a/0030-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch b/0020-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch
similarity index 96%
rename from 0030-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch
rename to 0020-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch
index e997b8c..550714c 100644
--- a/0030-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch
+++ b/0020-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch
@@ -1,8 +1,8 @@
-From bdd25983f5215edd46eb07fd7ff3e89857a33802 Mon Sep 17 00:00:00 2001
+From 2f3e47fb25719500bef0a663419bad75f1543e4f Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Thu, 23 Aug 2012 10:15:26 +0200
-Subject: [PATCH] Add org.apache.openjpa module. This allows to use the
- OpenJPA provider in persistence units.
+Subject: [PATCH] Add org.apache.openjpa module. This allows to use the OpenJPA
+ provider in persistence units.
---
build/build.xml | 12 ++++
@@ -15,10 +15,10 @@ Subject: [PATCH] Add org.apache.openjpa module. This allows to use the
create mode 100644 build/src/main/resources/modules/org/apache/openjpa/main/module.xml
diff --git a/build/build.xml b/build/build.xml
-index ced3d78..fa2ebbf 100644
+index 78cb0ec..1719d0e 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -482,6 +482,10 @@
+@@ -478,6 +478,10 @@
<maven-resource group="net.sourceforge.nekohtml" artifact="nekohtml"/>
</module-def>
@@ -29,7 +29,7 @@ index ced3d78..fa2ebbf 100644
<module-def name="org.apache.commons.beanutils">
<maven-resource group="commons-beanutils" artifact="commons-beanutils"/>
</module-def>
-@@ -586,6 +590,14 @@
+@@ -580,6 +584,14 @@
<maven-resource group="org.apache.juddi.scout" artifact="scout"/>
</module-def>
@@ -45,14 +45,13 @@ index ced3d78..fa2ebbf 100644
<maven-resource group="xalan" artifact="serializer"/>
<maven-resource group="xalan" artifact="xalan"/>
diff --git a/build/pom.xml b/build/pom.xml
-index 3adb3f0..4edc618 100644
+index 2ccc648..0163b93 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -567,6 +567,31 @@
- <artifactId>scout</artifactId>
+@@ -563,6 +563,31 @@
</dependency>
-+ <dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-jdbc</artifactId>
+ </dependency>
@@ -77,9 +76,10 @@ index 3adb3f0..4edc618 100644
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ </dependency>
+
- <!--
- <dependency>
++ <dependency>
<groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
+ </dependency>
diff --git a/build/src/main/resources/modules/net/sourceforge/serp/main/module.xml b/build/src/main/resources/modules/net/sourceforge/serp/main/module.xml
new file mode 100644
index 0000000..9ccd3ba
@@ -163,7 +163,7 @@ index 0000000..e2262b8
+ </dependencies>
+</module>
diff --git a/pom.xml b/pom.xml
-index e398654..195e0f0 100644
+index c3d3169..538a3e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,6 @@
@@ -182,7 +182,7 @@ index e398654..195e0f0 100644
<version.org.apache.httpcomponents.httpclient>4.1.2</version.org.apache.httpcomponents.httpclient>
<version.org.apache.httpcomponents.httpcore>4.1.4</version.org.apache.httpcomponents.httpcore>
<version.org.apache.neethi>3.0.1</version.org.apache.neethi>
-@@ -2786,6 +2786,80 @@
+@@ -2785,6 +2785,80 @@
</dependency>
<dependency>
diff --git a/0031-Add-org.hibernate.3-module.patch b/0021-fedora-Add-org.hibernate.3-module.patch
similarity index 67%
rename from 0031-Add-org.hibernate.3-module.patch
rename to 0021-fedora-Add-org.hibernate.3-module.patch
index 8f9c807..ec3f34d 100644
--- a/0031-Add-org.hibernate.3-module.patch
+++ b/0021-fedora-Add-org.hibernate.3-module.patch
@@ -1,21 +1,22 @@
-From feda896d84df8b3bb4cdfce7e6f3006925817feb Mon Sep 17 00:00:00 2001
+From 5f592736da6d21e16e660a4d00eb0df0d0bea72a Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Thu, 23 Aug 2012 10:31:46 +0200
-Subject: [PATCH] Add org.hibernate.3 module
+Subject: [PATCH] [fedora] Add org.hibernate.3 module
---
- build/build.xml | 7 ++++
+ build/build.xml | 8 ++++
.../resources/modules/org/hibernate/3/module.xml | 45 ++++++++++++++++++++++
- 2 files changed, 52 insertions(+)
+ jpa/hibernate3/pom.xml | 6 +--
+ 3 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 build/src/main/resources/modules/org/hibernate/3/module.xml
diff --git a/build/build.xml b/build/build.xml
-index fa2ebbf..5ffd678 100644
+index 1719d0e..23b49c9 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -659,6 +659,13 @@
+@@ -645,9 +645,17 @@
+ <maven-resource group="org.hibernate" artifact="hibernate-infinispan"/>
</module-def>
- -->
+ <module-def name="org.hibernate" slot="3">
+ <maven-resource group="org.hibernate" artifact="hibernate-core" />
@@ -24,6 +25,10 @@ index fa2ebbf..5ffd678 100644
+ <maven-resource group="org.hibernate" artifact="hibernate-infinispan"/>
+ </module-def>
+
+ <module-def name="org.hibernate.envers">
+ <maven-resource group="org.hibernate" artifact="hibernate-envers"/>
+ </module-def>
++
<module-def name="org.hibernate.validator">
<maven-resource group="org.hibernate" artifact="hibernate-validator"/>
</module-def>
@@ -78,3 +83,30 @@ index 0000000..1b159a7
+ <module name="org.slf4j"/>
+ </dependencies>
+</module>
+diff --git a/jpa/hibernate3/pom.xml b/jpa/hibernate3/pom.xml
+index 86564ec..45d4aaa 100644
+--- a/jpa/hibernate3/pom.xml
++++ b/jpa/hibernate3/pom.xml
+@@ -44,19 +44,19 @@
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+- <version>3.6.6.Final</version>
++ <version>3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+- <version>3.6.6.Final</version>
++ <version>3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-infinispan</artifactId>
+- <version>3.6.6.Final</version>
++ <version>3</version>
+ </dependency>
+
+ <!-- Internal -->
diff --git a/0037-Add-org.osgi-org.osgi.compendium-dependency-since-it.patch b/0022-fedora-Add-org.osgi-org.osgi.compendium-dependency-s.patch
similarity index 79%
rename from 0037-Add-org.osgi-org.osgi.compendium-dependency-since-it.patch
rename to 0022-fedora-Add-org.osgi-org.osgi.compendium-dependency-s.patch
index 222c06f..c9d8972 100644
--- a/0037-Add-org.osgi-org.osgi.compendium-dependency-since-it.patch
+++ b/0022-fedora-Add-org.osgi-org.osgi.compendium-dependency-s.patch
@@ -1,9 +1,8 @@
-From 19738f96b00061a9643a56270b996a87ec5d8df1 Mon Sep 17 00:00:00 2001
+From 3da4a24845e7315314e57754715692bf25795125 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Wed, 24 Oct 2012 11:11:33 +0200
-Subject: [PATCH] Add org.osgi:org.osgi.compendium dependency since it was
- unbundled from
- org.jboss.osgi.framework:jbosgi-framework-core but is
+Subject: [PATCH] [fedora] Add org.osgi:org.osgi.compendium dependency since it
+ was unbundled from org.jboss.osgi.framework:jbosgi-framework-core but is
required by org.jboss.as.osgi
---
@@ -13,10 +12,10 @@ Subject: [PATCH] Add org.osgi:org.osgi.compendium dependency since it was
3 files changed, 12 insertions(+)
diff --git a/build/build.xml b/build/build.xml
-index b03a344..78d0331 100644
+index 23b49c9..c82c6c7 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -1005,6 +1005,7 @@
+@@ -994,6 +994,7 @@
<maven-resource group="org.jboss.osgi.resolver" artifact="jbosgi-resolver-api"/>
<maven-resource group="org.jboss.osgi.resolver" artifact="jbosgi-resolver-spi"/>
<maven-resource group="org.jboss.osgi.resolver" artifact="jbosgi-resolver-felix"/>
@@ -25,23 +24,23 @@ index b03a344..78d0331 100644
<module-def name="org.jboss.osgi.repository">
diff --git a/build/pom.xml b/build/pom.xml
-index 2371b44..b50b13e 100644
+index 0163b93..f63797d 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -1618,6 +1618,11 @@
- <artifactId>org.osgi.core</artifactId>
+@@ -1600,6 +1600,11 @@
</dependency>
-+ <dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+
- <!--
- <dependency>
++ <dependency>
<groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed</artifactId>
+ </dependency>
diff --git a/pom.xml b/pom.xml
-index b56b0af..e945f35 100644
+index 538a3e3..897243b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5713,6 +5713,12 @@
diff --git a/0040-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch b/0023-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch
similarity index 98%
rename from 0040-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch
rename to 0023-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch
index 6106a35..01e87e9 100644
--- a/0040-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch
+++ b/0023-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch
@@ -1,4 +1,4 @@
-From d92c6ea7032bf059807cc7f8842db68968234737 Mon Sep 17 00:00:00 2001
+From e4af9e97b2b94401ee1f3cba75a1892bc5d269c9 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Mon, 19 Nov 2012 11:14:57 +0100
Subject: [PATCH] [JBWS-3446] Add methods for creating a test https connector
diff --git a/0041-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch b/0024-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch
similarity index 94%
rename from 0041-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch
rename to 0024-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch
index 904de6a..00e35a1 100644
--- a/0041-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch
+++ b/0024-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch
@@ -1,4 +1,4 @@
-From 7dcb39c5466346e7ab45492e20396e6684933693 Mon Sep 17 00:00:00 2001
+From 14882bb0ab177419f97def6169b788e58f45169f Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Mon, 19 Nov 2012 12:13:13 +0100
Subject: [PATCH] Modified [AS7-4890] upgrade to JBossWS 4.1.0.Beta1
@@ -12,6 +12,7 @@ Subject: [PATCH] Modified [AS7-4890] upgrade to JBossWS 4.1.0.Beta1
.../modules/org/apache/ws/security/main/module.xml | 2 +
.../org/jboss/as/webservices/main/module.xml | 1 -
.../webservices/server/integration/main/module.xml | 2 +-
+ .../server/jaxrpc-integration/main/module.xml | 4 -
.../ws/cxf/jbossws-cxf-client/main/module.xml | 2 +-
.../ws/cxf/jbossws-cxf-server/main/module.xml | 2 +-
.../main/module.xml | 2 +-
@@ -20,13 +21,13 @@ Subject: [PATCH] Modified [AS7-4890] upgrade to JBossWS 4.1.0.Beta1
.../jbossws-native-factories/main/module.xml | 34 ----
.../resources/modules/org/opensaml/main/module.xml | 38 ++++
pom.xml | 218 ++++++++++++++-------
- 16 files changed, 339 insertions(+), 178 deletions(-)
+ 17 files changed, 339 insertions(+), 182 deletions(-)
create mode 100644 build/src/main/resources/modules/org/apache/cxf/impl/main/module.xml
delete mode 100644 build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-factories/main/module.xml
create mode 100644 build/src/main/resources/modules/org/opensaml/main/module.xml
diff --git a/build/build.xml b/build/build.xml
-index a98baa6..404ff65 100644
+index c82c6c7..64cc7f3 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -518,9 +518,10 @@
@@ -63,7 +64,7 @@ index a98baa6..404ff65 100644
<maven-resource group="org.apache.cxf.xjcplugins" artifact="cxf-xjc-boolean"/>
<maven-resource group="org.apache.cxf.xjcplugins" artifact="cxf-xjc-dv"/>
<maven-resource group="org.apache.cxf.xjcplugins" artifact="cxf-xjc-ts"/>
-@@ -1120,10 +1122,6 @@
+@@ -1116,10 +1118,6 @@
<maven-resource group="org.jboss.ws.native" artifact="jbossws-native-core"/>
</module-def>
@@ -74,7 +75,7 @@ index a98baa6..404ff65 100644
<module-def name="org.jboss.ws.native.jbossws-native-services">
<maven-resource group="org.jboss.ws.native" artifact="jbossws-native-services"/>
</module-def>
-@@ -1141,6 +1139,12 @@
+@@ -1136,6 +1134,12 @@
<maven-resource group="org.jboss.ws" artifact="jbossws-common-tools"/>
</module-def>
@@ -88,10 +89,10 @@ index a98baa6..404ff65 100644
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 17bf70b..14177f3 100644
+index f63797d..d7f6569 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -371,21 +371,11 @@
+@@ -374,21 +374,11 @@
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -113,7 +114,7 @@ index 17bf70b..14177f3 100644
<artifactId>cxf-rt-bindings-object</artifactId>
</dependency>
-@@ -431,11 +421,6 @@
+@@ -434,11 +424,6 @@
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -125,7 +126,7 @@ index 17bf70b..14177f3 100644
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
-@@ -456,6 +441,11 @@
+@@ -459,6 +444,11 @@
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -137,7 +138,7 @@ index 17bf70b..14177f3 100644
<artifactId>cxf-rt-ws-policy</artifactId>
</dependency>
-@@ -500,6 +490,11 @@
+@@ -503,6 +493,11 @@
</dependency>
<dependency>
@@ -149,7 +150,7 @@ index 17bf70b..14177f3 100644
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-boolean</artifactId>
</dependency>
-@@ -515,6 +510,21 @@
+@@ -518,6 +513,21 @@
</dependency>
<dependency>
@@ -171,7 +172,7 @@ index 17bf70b..14177f3 100644
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
</dependency>
-@@ -1567,11 +1577,6 @@
+@@ -1561,11 +1571,6 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
@@ -182,7 +183,7 @@ index 17bf70b..14177f3 100644
- <groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-services</artifactId>
</dependency>
- -->
+
diff --git a/build/src/license/licenses.xml b/build/src/license/licenses.xml
index a1bf243..5d09708 100644
--- a/build/src/license/licenses.xml
@@ -407,10 +408,10 @@ index 0000000..60af359
+ </dependencies>
+</module>
diff --git a/build/src/main/resources/modules/org/apache/cxf/main/module.xml b/build/src/main/resources/modules/org/apache/cxf/main/module.xml
-index 91e8fec..4dd7698 100644
+index 24cce6e..41f8c1b 100644
--- a/build/src/main/resources/modules/org/apache/cxf/main/module.xml
+++ b/build/src/main/resources/modules/org/apache/cxf/main/module.xml
-@@ -33,12 +33,19 @@
+@@ -33,6 +33,12 @@
<dependencies>
<module name="asm.asm" />
@@ -423,6 +424,7 @@ index 91e8fec..4dd7698 100644
<module name="javax.api" />
<module name="javax.annotation.api" />
<module name="javax.jms.api" />
+@@ -40,6 +46,7 @@
<module name="javax.mail.api" />
<module name="javax.resource.api" />
<module name="javax.servlet.api" />
@@ -443,10 +445,10 @@ index d414930..d136e75 100644
</dependencies>
</module>
diff --git a/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml b/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
-index 1d7d8fe..f74baa0 100644
+index c8b2bca..d47a8f2 100644
--- a/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
+++ b/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
-@@ -50,7 +50,6 @@
+@@ -51,7 +51,6 @@
<module name="org.jboss.as.security"/>
<module name="org.jboss.as.web"/>
<module name="org.jboss.threads"/>
@@ -455,10 +457,10 @@ index 1d7d8fe..f74baa0 100644
<module name="org.jboss.msc"/>
<module name="org.jboss.vfs"/>
diff --git a/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml b/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
-index 0129380..147658c 100644
+index 559ff3f..c4f01fb 100644
--- a/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
+++ b/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
-@@ -61,7 +61,7 @@
+@@ -62,7 +62,7 @@
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/>
<!-- Do not import services from cxf module direclty, those need to come from jbossws -->
@@ -467,6 +469,32 @@ index 0129380..147658c 100644
<imports>
<include path="META-INF/cxf"/>
<include path="META-INF"/>
+diff --git a/build/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml b/build/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
+index 6d227fb..3322fae 100644
+--- a/build/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
++++ b/build/src/main/resources/modules/org/jboss/as/webservices/server/jaxrpc-integration/main/module.xml
+@@ -29,13 +29,10 @@
+
+ <dependencies>
+ <module name="javax.api" export="true"/>
+- <module name="javax.xml.rpc.api" export="true"/>
+ <module name="javax.wsdl4j.api" export="true"/>
+- <module name="com.sun.xml.bind" services="export" export="true"/>
+ <module name="org.jboss.ws.api" export="true"/>
+ <module name="org.jboss.ws.spi" export="true"/>
+ <module name="org.jboss.ws.common" services="import" export="true"/>
+- <module name="org.jboss.ws.native.jbossws-native-factories" services="export" export="true"/>
+ <module name="org.jboss.ws.native.jbossws-native-core" services="export" export="true">
+ <imports>
+ <include path="META-INF"/>
+@@ -49,7 +46,6 @@
+ </exports>
+ </module>
+ <module name="org.jboss.ws.native.jbossws-native-services" services="export" export="true"/>
+- <module name="org.apache.xalan" services="export" export="true"/>
+ <module name="org.apache.xerces" services="export" export="true"/>
+ <module name="org.jboss.as.webservices" services="export" export="true"/>
+ </dependencies>
diff --git a/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
index 80e7c7a..3b36525 100644
--- a/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
@@ -481,10 +509,10 @@ index 80e7c7a..3b36525 100644
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" export="true" services="export" />
<module name="org.jboss.jaxbintros" export="true"/>
diff --git a/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
-index 67373a7..d124a2a 100644
+index f2ffe48..decea5f 100644
--- a/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
+++ b/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
<module name="org.jboss.ws.jaxws-client" />
<module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
<!-- do not import services from cxf, those need to come from jbossws -->
@@ -520,10 +548,10 @@ index 0c97c7e..58e4aca 100644
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
<include path="META-INF/"/>
diff --git a/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
-index a06092f..1f9915d 100644
+index 8230bbc..8792b05 100644
--- a/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
+++ b/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
-@@ -55,7 +55,6 @@
+@@ -56,7 +56,6 @@
<module name="org.jboss.ws.api" />
<module name="org.jboss.ws.spi" />
<module name="org.jboss.ws.common" />
@@ -616,7 +644,7 @@ index 0000000..f588b75
+ </dependencies>
+</module>
diff --git a/pom.xml b/pom.xml
-index 132f42e..1e77afb 100644
+index 897243b..70c105e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,8 +108,8 @@
diff --git a/0025-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch b/0025-fedora-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
similarity index 87%
rename from 0025-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
rename to 0025-fedora-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
index b6244e9..45987c6 100644
--- a/0025-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
+++ b/0025-fedora-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
@@ -1,14 +1,15 @@
-From 5ce83ed3fa197ef2b35fbad9281b02c8dbe24f69 Mon Sep 17 00:00:00 2001
+From b106a3c6e2616901a92292862f765543d683e095 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Thu, 21 Jun 2012 16:18:28 +0200
-Subject: [PATCH] Remove javax.jws.api. This is part of the JDK.
+Subject: [PATCH] [fedora] Remove javax.jws.api. This is part of the JDK.
---
- build/build.xml | 6 -----
- build/pom.xml | 7 ------
+ build/build.xml | 4 ---
+ build/pom.xml | 5 ----
.../resources/modules/javaee/api/main/module.xml | 1 -
.../resources/modules/javax/api/main/module.xml | 1 +
.../modules/javax/jws/api/main/module.xml | 29 ----------------------
+ .../modules/org/apache/cxf/impl/main/module.xml | 7 +++++-
.../modules/org/apache/cxf/main/module.xml | 1 -
.../org/jboss/as/webservices/main/module.xml | 1 -
.../webservices/server/integration/main/module.xml | 1 -
@@ -17,44 +18,40 @@ Subject: [PATCH] Remove javax.jws.api. This is part of the JDK.
.../ws/cxf/jbossws-cxf-server/main/module.xml | 1 -
.../ws/native/jbossws-native-core/main/module.xml | 1 -
.../modules/org/jboss/xts/main/module.xml | 5 ----
- 13 files changed, 1 insertion(+), 55 deletions(-)
+ 14 files changed, 7 insertions(+), 52 deletions(-)
delete mode 100644 build/src/main/resources/modules/javax/jws/api/main/module.xml
diff --git a/build/build.xml b/build/build.xml
-index 63995ba..f4ef723 100644
+index 64cc7f3..6cd12d8 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -388,12 +388,6 @@
+@@ -384,10 +384,6 @@
<maven-resource group="org.jboss.spec.javax.jms" artifact="jboss-jms-api_1.1_spec"/>
</module-def>
-- <!--
- <module-def name="javax.jws.api">
- <maven-resource group="javax.jws" artifact="jsr181-api"/>
- </module-def>
-- -->
-
<module-def name="javax.management.j2ee.api">
<maven-resource group="org.jboss.spec.javax.management.j2ee" artifact="jboss-j2eemgmt-api_1.1_spec"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 0cb1306..1541a0e 100644
+index d7f6569..cafd709 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -318,13 +318,6 @@
- <artifactId>javax.inject</artifactId>
+@@ -318,11 +318,6 @@
</dependency>
-- <!--
-- <dependency>
+ <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </dependency>
-- -->
-
- <dependency>
+- <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ </dependency>
diff --git a/build/src/main/resources/modules/javaee/api/main/module.xml b/build/src/main/resources/modules/javaee/api/main/module.xml
index a0c5f12..a8c65c7 100644
--- a/build/src/main/resources/modules/javaee/api/main/module.xml
@@ -114,11 +111,33 @@ index 3332464..0000000
- <!-- Insert resources here -->
- </resources>
-</module>
+diff --git a/build/src/main/resources/modules/org/apache/cxf/impl/main/module.xml b/build/src/main/resources/modules/org/apache/cxf/impl/main/module.xml
+index 60af359..2530c5b 100644
+--- a/build/src/main/resources/modules/org/apache/cxf/impl/main/module.xml
++++ b/build/src/main/resources/modules/org/apache/cxf/impl/main/module.xml
+@@ -28,11 +28,16 @@
+ </resources>
+
+ <dependencies>
++ <system>
++ <paths>
++ <path name="javax/jws/soap"/>
++ </paths>
++ </system>
++
+ <module name="asm.asm" />
+ <module name="javax.api" />
+ <module name="javax.annotation.api" />
+ <module name="javax.jms.api" />
+- <module name="javax.jws.api" />
+ <module name="javax.mail.api" />
+ <module name="javax.resource.api" />
+ <module name="javax.servlet.api" />
diff --git a/build/src/main/resources/modules/org/apache/cxf/main/module.xml b/build/src/main/resources/modules/org/apache/cxf/main/module.xml
-index 24cce6e..91e8fec 100644
+index 41f8c1b..4dd7698 100644
--- a/build/src/main/resources/modules/org/apache/cxf/main/module.xml
+++ b/build/src/main/resources/modules/org/apache/cxf/main/module.xml
-@@ -36,7 +36,6 @@
+@@ -42,7 +42,6 @@
<module name="javax.api" />
<module name="javax.annotation.api" />
<module name="javax.jms.api" />
@@ -127,7 +146,7 @@ index 24cce6e..91e8fec 100644
<module name="javax.resource.api" />
<module name="javax.servlet.api" />
diff --git a/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml b/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
-index c8b2bca..1d7d8fe 100644
+index d47a8f2..f74baa0 100644
--- a/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
+++ b/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
@@ -35,7 +35,6 @@
@@ -139,7 +158,7 @@ index c8b2bca..1d7d8fe 100644
<module name="javax.xml.ws.api"/>
<module name="org.jboss.ejb3"/>
diff --git a/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml b/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
-index 559ff3f..0129380 100644
+index c4f01fb..147658c 100644
--- a/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
+++ b/build/src/main/resources/modules/org/jboss/as/webservices/server/integration/main/module.xml
@@ -32,7 +32,6 @@
@@ -175,7 +194,7 @@ index 3295568..5f2673b 100644
<module name="javax.wsdl4j.api" />
<module name="javax.xml.ws.api"/>
diff --git a/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
-index f2ffe48..67373a7 100644
+index decea5f..d124a2a 100644
--- a/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
+++ b/build/src/main/resources/modules/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
@@ -35,7 +35,6 @@
@@ -187,7 +206,7 @@ index f2ffe48..67373a7 100644
<module name="javax.xml.bind.api" />
<module name="javax.xml.stream.api" />
diff --git a/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
-index 8230bbc..a06092f 100644
+index 8792b05..1f9915d 100644
--- a/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
+++ b/build/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml
@@ -38,7 +38,6 @@
diff --git a/0044-fedora-Missing-module-dependencies-after-unbundling.patch b/0026-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
similarity index 58%
rename from 0044-fedora-Missing-module-dependencies-after-unbundling.patch
rename to 0026-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
index 6fc1b06..587c28c 100644
--- a/0044-fedora-Missing-module-dependencies-after-unbundling.patch
+++ b/0026-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
@@ -1,50 +1,54 @@
-From 68fd2994aae24d9ae76935994ae48793d3292fc5 Mon Sep 17 00:00:00 2001
+From e6bd7d7f84cebd4b277c7d936cbde6cac919f082 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
-Date: Fri, 23 Nov 2012 13:12:22 +0100
-Subject: [PATCH] [fedora] Missing module dependencies after unbundling
+Date: Fri, 30 Nov 2012 13:24:53 +0100
+Subject: [PATCH] [fedora] Missing module dependencies in mime4j,
+ com.sun.xml.bind and org.apache.xerces after unbundling
---
- build/build.xml | 2 ++
- build/pom.xml | 10 ++++++++++
- .../main/resources/modules/com/sun/xml/bind/main/module.xml | 3 +++
- .../main/resources/modules/org/apache/cxf/impl/main/module.xml | 6 ++++++
- .../main/resources/modules/org/apache/xerces/main/module.xml | 2 ++
- 5 files changed, 23 insertions(+)
+ build/build.xml | 4 +++-
+ build/pom.xml | 12 +++++++++++-
+ .../main/resources/modules/com/sun/xml/bind/main/module.xml | 3 +++
+ .../main/resources/modules/org/apache/xerces/main/module.xml | 2 ++
+ 4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 6ed2367..634e305 100644
+index 6cd12d8..52d4429 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -560,6 +560,8 @@
+@@ -555,7 +555,9 @@
+ </module-def>
<module-def name="org.apache.james.mime4j">
- <maven-resource group="org.apache.james" artifact="apache-mime4j-core"/>
+- <maven-resource group="org.apache.james" artifact="apache-mime4j"/>
++ <maven-resource group="org.apache.james" artifact="apache-mime4j-core"/>
+ <maven-resource group="org.apache.james" artifact="apache-mime4j-dom"/>
+ <maven-resource group="org.apache.james" artifact="apache-mime4j-storage"/>
</module-def>
<module-def name="org.apache.juddi.juddi-client">
diff --git a/build/pom.xml b/build/pom.xml
-index 41d5fde..b6e3664 100644
+index cafd709..017f42b 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -557,6 +557,16 @@
- </dependency>
+@@ -549,7 +549,17 @@
<dependency>
-+ <groupId>org.apache.james</groupId>
-+ <artifactId>apache-mime4j-dom</artifactId>
+ <groupId>org.apache.james</groupId>
+- <artifactId>apache-mime4j</artifactId>
++ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
-+ <artifactId>apache-mime4j-storage</artifactId>
++ <artifactId>apache-mime4j-dom</artifactId>
+ </dependency>
+
+ <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
++ <groupId>org.apache.james</groupId>
++ <artifactId>apache-mime4j-storage</artifactId>
</dependency>
+
+ <dependency>
diff --git a/build/src/main/resources/modules/com/sun/xml/bind/main/module.xml b/build/src/main/resources/modules/com/sun/xml/bind/main/module.xml
index a48db1b..f821c27 100644
--- a/build/src/main/resources/modules/com/sun/xml/bind/main/module.xml
@@ -59,23 +63,6 @@ index a48db1b..f821c27 100644
<!-- Insert resources here -->
</resources>
-diff --git a/build/src/main/resources/modules/org/apache/cxf/impl/main/module.xml b/build/src/main/resources/modules/org/apache/cxf/impl/main/module.xml
-index 9d749f8..2530c5b 100644
---- a/build/src/main/resources/modules/org/apache/cxf/impl/main/module.xml
-+++ b/build/src/main/resources/modules/org/apache/cxf/impl/main/module.xml
-@@ -28,6 +28,12 @@
- </resources>
-
- <dependencies>
-+ <system>
-+ <paths>
-+ <path name="javax/jws/soap"/>
-+ </paths>
-+ </system>
-+
- <module name="asm.asm" />
- <module name="javax.api" />
- <module name="javax.annotation.api" />
diff --git a/build/src/main/resources/modules/org/apache/xerces/main/module.xml b/build/src/main/resources/modules/org/apache/xerces/main/module.xml
index 0e04923..65f3893 100644
--- a/build/src/main/resources/modules/org/apache/xerces/main/module.xml
diff --git a/0027-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch b/0027-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
new file mode 100644
index 0000000..9b8555f
--- /dev/null
+++ b/0027-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
@@ -0,0 +1,177 @@
+From a344d17f9e0d49c435a4f1468526e7e25b77c7bd Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Fri, 30 Nov 2012 14:01:30 +0100
+Subject: [PATCH] [fedora] Remove still unavailable in Fedora dependencies
+
+---
+ build/build.xml | 12 ++++++++++++
+ build/pom.xml | 12 ++++++++++++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/build/build.xml b/build/build.xml
+index 52d4429..425bc63 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -86,7 +86,9 @@
+
+ <target name="create-ext-content">
+ <mkdir dir="${output.dir}/modules/org/jboss/integration/ext-content/main/bundled"/>
++ <!--
+ <copy file="${org.jboss.seam.integration:jboss-seam-int-jbossas:jar}" tofile="${output.dir}/modules/org/jboss/integration/ext-content/main/bundled/jboss-seam-int.jar"/>
++ -->
+
+ <!-- Copy the EJB specific schemas to the JBOSS_HOME/docs/schema folder -->
+ <unzip src="${org.jboss.metadata:jboss-metadata-ejb:jar}" dest="${output.dir}/docs/schema/">
+@@ -321,9 +323,11 @@
+ <maven-resource group="com.sun.faces" artifact="jsf-impl"/>
+ </module-def>
+
++ <!--
+ <module-def name="com.sun.jsf-impl" slot="1.2">
+ <maven-resource group="javax.faces" artifact="jsf-impl"/>
+ </module-def>
++ -->
+
+ <module-def name="com.sun.xml.bind">
+ <maven-resource group="com.sun.xml.bind" artifact="jaxb-impl"/>
+@@ -707,9 +711,11 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-appclient"/>
+ </module-def>
+
++ <!--
+ <module-def name="org.jboss.as.console">
+ <maven-resource-with-classifier group="org.jboss.as" artifact="jboss-as-console" classifier="resources"/>
+ </module-def>
++ -->
+
+ <module-def name="org.jboss.as.cli">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-cli"/>
+@@ -1171,11 +1177,13 @@
+ <maven-resource group="org.osgi" artifact="org.osgi.core"/>
+ </module-def>
+
++ <!--
+ <module-def name="org.picketlink">
+ <maven-resource group="org.picketlink" artifact="picketlink-fed" jandex="true"/>
+ <maven-resource group="org.picketlink" artifact="picketlink-bindings" jandex="true"/>
+ <maven-resource group="org.picketlink" artifact="picketlink-bindings-jboss"/>
+ </module-def>
++ -->
+
+ <module-def name="org.picketbox">
+ <maven-resource group="org.picketbox" artifact="picketbox"/>
+@@ -1233,14 +1241,17 @@
+ <maven-bundle group="org.apache.felix" artifact="org.apache.felix.configadmin"/>
+ </bundle-def>
+
++ <!--
+ <bundle-def name="org.apache.felix.log">
+ <maven-bundle group="org.apache.felix" artifact="org.apache.felix.log"/>
+ </bundle-def>
++ -->
+
+ <bundle-def name="org.jboss.as.osgi.configadmin">
+ <maven-bundle group="org.jboss.as" artifact="jboss-as-osgi-configadmin"/>
+ </bundle-def>
+
++ <!--
+ <bundle-def name="javax.servlet.api" slot="v25">
+ <maven-bundle group="org.jboss.osgi.http" artifact="jbosgi-http-api"/>
+ </bundle-def>
+@@ -1256,6 +1267,7 @@
+ <bundle-def name="org.projectodd.stilts">
+ <maven-bundle group="org.projectodd.stilts" artifact="stilts-stomplet-server-bundle"/>
+ </bundle-def>
++ -->
+ </target>
+
+ <target name="clean-target">
+diff --git a/build/pom.xml b/build/pom.xml
+index 017f42b..83683e3 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -307,10 +307,12 @@
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+@@ -527,10 +529,12 @@
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+@@ -828,11 +832,13 @@
+ <artifactId>jboss-as-configadmin</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-console</artifactId>
+ <classifier>resources</classifier>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+@@ -1223,6 +1229,7 @@
+ <artifactId>jbosgi-framework-core</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss.osgi.http</groupId>
+ <artifactId>jbosgi-http-api</artifactId>
+@@ -1232,6 +1239,7 @@
+ <groupId>org.jboss.osgi.logging</groupId>
+ <artifactId>jboss-osgi-logging</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.jboss.osgi.repository</groupId>
+@@ -1318,10 +1326,12 @@
+ <artifactId>jboss-sasl</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss.seam.integration</groupId>
+ <artifactId>jboss-seam-int-jbossas</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+@@ -1614,6 +1624,7 @@
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed</artifactId>
+@@ -1633,6 +1644,7 @@
+ <groupId>org.projectodd.stilts</groupId>
+ <artifactId>stilts-stomplet-server-bundle</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.scannotation</groupId>
diff --git a/0028-fedora-Do-not-extract-jbossweb-native-it-s-symlinked.patch b/0028-fedora-Do-not-extract-jbossweb-native-it-s-symlinked.patch
new file mode 100644
index 0000000..44e8e48
--- /dev/null
+++ b/0028-fedora-Do-not-extract-jbossweb-native-it-s-symlinked.patch
@@ -0,0 +1,23 @@
+From 64bcdfada949b3c514c49c9b04eedc5cb24f5c14 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Mon, 3 Dec 2012 13:11:04 +0100
+Subject: [PATCH] [fedora] Do not extract jbossweb-native, it's symlinked in
+ Fedora
+
+---
+ build/build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 425bc63..550ac83 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -896,7 +896,7 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-web"/>
+ <maven-resource group="org.eclipse.jdt" artifact="core"/>
+ <maven-resource group="org.jboss.web" artifact="jbossweb"/>
+- <extract-native-jar group="org.jboss.as" artifact="jbossweb-native"/>
++ <!-- <extract-native-jar group="org.jboss.as" artifact="jbossweb-native"/> symlinked in Fedora -->
+ </module-def>
+
+ <module-def name="org.jboss.as.webservices">
diff --git a/jboss-as.spec b/jboss-as.spec
index e4909cc..4130d45 100644
--- a/jboss-as.spec
+++ b/jboss-as.spec
@@ -19,7 +19,7 @@
Name: jboss-as
Version: 7.1.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: JBoss Application Server
Group: System Environment/Daemons
License: LGPLv2 and ASL 2.0
@@ -34,52 +34,34 @@ Source0: jboss-as-%{namedversion}-CLEAN.tar.xz
# Makes possible to run JBoss AS in different directory by creating the structure and copying required configuration files
Source1: jboss-as-cp.sh
-Patch0: 0001-AS7-3724-DO-NOT-UPSTREAM-an-ugly-patch-to-remove-IIO.patch
-Patch1: 0002-Disable-checkstyle.patch
-Patch2: 0003-Fix-initd-script.patch
-Patch3: 0004-Added-standalone-web.xml-example-configuration.-Use-.patch
-Patch4: 0005-Add-systemd-files-re-arrange-directory-with-init-scr.patch
-Patch5: 0006-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
-Patch6: 0007-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
-Patch7: 0008-Remove-activation-module.patch
-Patch8: 0009-Use-properties-in-add-user-AS7-module.patch
-Patch9: 0010-added-support-for-overriding-the-user-and-roles-prop.patch
-Patch10: 0011-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
-Patch11: 0012-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
-Patch12: 0013-Remove-jasper-jdt-requirement-it-was-replaced-by-ecj.patch
-Patch13: 0014-Disable-still-not-available-modules.patch
-Patch14: 0015-Removed-unused-import-in-modcluster-module.patch
-Patch15: 0016-Remove-org.osgi.enterprise-dependency.patch
-Patch16: 0017-Drop-some-enforcer-exclusions-these-are-aliases-in-F.patch
-Patch17: 0018-Disable-Hibernate.patch
-Patch18: 0019-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch
-Patch19: 0020-Commenting-out-still-unavailable-dependencies.patch
-Patch20: 0021-Disable-checkstyle-in-testsuite-too.patch
-Patch21: 0022-Disable-testsuites.patch
-Patch22: 0023-Added-org.jboss.as.jdr-module.patch
-Patch23: 0024-Make-AS7-work-with-jython-2.2.1.patch
-Patch24: 0025-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
-Patch25: 0026-Specify-version-requirement-for-org.eclipse.jdt-core.patch
-Patch26: 0027-Link-ecj-in-the-org.jboss.as.web-module-to-be-able-t.patch
-Patch27: 0028-Add-ExampleDS-H2-datasource-to-standalone-web.xml.patch
-Patch28: 0029-Add-jtype-dependency-to-hibernate-validator-to-fix-t.patch
-Patch29: 0030-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch
-Patch30: 0031-Add-org.hibernate.3-module.patch
-Patch31: 0032-Enable-jpa-openjpa-and-jpa-hibernate3-modules.patch
-Patch32: 0033-Revert-AS7-3724-DO-NOT-UPSTREAM-an-ugly-patch-to-rem.patch
-Patch33: 0034-Enable-jbossxb-module.patch
-Patch34: 0035-Added-org.jboss.as.xts-module.patch
-Patch35: 0036-Add-support-for-Hibernate-4.patch
-Patch36: 0037-Add-org.osgi-org.osgi.compendium-dependency-since-it.patch
-Patch37: 0038-Disable-jbossws-native-usage.patch
-Patch38: 0039-Enabled-webservices-related-moduled.patch
-Patch39: 0040-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch
-Patch40: 0041-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch
-Patch41: 0042-Revert-Disable-jbossws-native-usage.patch
-Patch42: 0043-Enable-jbossws-native-remove-javax.jws.api-from-cxf-.patch
-Patch43: 0044-fedora-Missing-module-dependencies-after-unbundling.patch
-Patch44: 0045-Make-standalone.xml-the-default-configuration-instea.patch
-Patch45: 0046-Add-an-easy-way-to-override-the-default-bind-address.patch
+Patch0: 0001-fedora-Disable-checkstyle.patch
+Patch1: 0002-fedora-Added-standalone-web.xml-example-configuratio.patch
+Patch2: 0003-Add-systemd-files-re-arrange-directory-with-init-scr.patch
+Patch3: 0004-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
+Patch4: 0005-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
+Patch5: 0006-fedora-Remove-activation-module.patch
+Patch6: 0007-Use-properties-in-add-user-AS7-module.patch
+Patch7: 0008-added-support-for-overriding-the-user-and-roles-prop.patch
+Patch8: 0009-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
+Patch9: 0010-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
+Patch10: 0011-fedora-Remove-jasper-jdt-requirement-it-was-replaced.patch
+Patch11: 0012-Removed-unused-import-in-modcluster-module.patch
+Patch12: 0013-fedora-Remove-org.osgi.enterprise-dependency.patch
+Patch13: 0014-fedora-Drop-some-enforcer-exclusions-these-are-alias.patch
+Patch14: 0015-fedora-Remove-jbossweb-native-dependency.-We-ll-have.patch
+Patch15: 0016-fedora-Disable-checkstyle-in-testsuite-too.patch
+Patch16: 0017-fedora-Disable-testsuites.patch
+Patch17: 0018-fedora-Make-AS7-work-with-jython-2.2.1.patch
+Patch18: 0019-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
+Patch19: 0020-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch
+Patch20: 0021-fedora-Add-org.hibernate.3-module.patch
+Patch21: 0022-fedora-Add-org.osgi-org.osgi.compendium-dependency-s.patch
+Patch22: 0023-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch
+Patch23: 0024-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch
+Patch24: 0025-fedora-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
+Patch25: 0026-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
+Patch26: 0027-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
+Patch27: 0028-fedora-Do-not-extract-jbossweb-native-it-s-symlinked.patch
BuildArch: noarch
@@ -962,7 +944,10 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath shrinkwrap/impl-base) org/jboss/shrinkwrap/core/main/impl-base.jar
ln -s $(build-classpath slf4j/api) org/slf4j/main/api.jar
+ ln -s $(build-classpath slf4j/api) org/slf4j/main/slf4j-api.jar
ln -s $(build-classpath slf4j/ext) org/slf4j/ext/main/ext.jar
+ ln -s $(build-classpath slf4j/ext) org/slf4j/ext/main/slf4j-ext.jar
+
ln -s $(build-classpath slf4j/jcl-over-slf4j) org/slf4j/jcl-over-slf4j/main/jcl-over-slf4j.jar
ln -s $(build-classpath slf4j-jboss-logmanager) org/slf4j/impl/main/slf4j-jboss-logmanager.jar
ln -s $(build-classpath snakeyaml) org/yaml/snakeyaml/main/snakeyaml.jar
@@ -1123,6 +1108,9 @@ fi
%doc %{homedir}/LICENSE.txt
%changelog
+* Tue Dec 04 2012 Marek Goldmann <mgoldman at redhat.com> - 7.1.1-13
+- Rebasing patches
+
* Wed Nov 28 2012 Marek Goldmann <mgoldman at redhat.com> - 7.1.1-12
- Fixing many missing symlinks
- Make standalone.xml the default configuration instead standalone-web.xml
More information about the scm-commits
mailing list