[jboss-as] Changed the way we apply patches. Building now default profile instead of minimalistic. Removed a lo
Marek Goldmann
goldmann at fedoraproject.org
Wed Jul 4 08:57:24 UTC 2012
commit e521c4921f26af02686387b53015ffd351a24c1e
Author: Marek Goldmann <mgoldman at redhat.com>
Date: Wed Jul 4 10:24:25 2012 +0200
Changed the way we apply patches. Building now default profile instead of minimalistic. Removed a lot of unnecessary patches and added new, required modules.
- jboss-as-cp script is missing argument placeholder for c optarg, RHBZ#827571
- Create a startup script when creating a new user instance (jboss-as-cp), RHBZ#827588
- The user instance create script (jboss-as-cp) should allow a port offset to be specified, RHBZ#827589
- Added org.jboss.as.modcluster module
- Added org.jboss.as.jsr77 module
- Added org.jboss.as.arquillian module
- Added org.jboss.as.osgi module
- Added org.jboss.as.configadmin module
- Added org.jboss.as.spec-api module
- Add ExampleDS based on H2 database, RHBZ#81252
...-NOT-UPSTREAM-an-ugly-patch-to-remove-IIO.patch | 6 +-
0002-Disable-checkstyle.patch | 6 +-
0003-Fix-initd-script.patch | 6 +-
...alone-web.xml-example-configuration.-Use-.patch | 6 +-
0004-Build-additional-modules.patch | 206 -----
...-files-re-arrange-directory-with-init-scr.patch | 6 +-
...ng-javax.transaction-to-the-minimal-build.patch | 38 -
...OME-when-jboss-cli.sh-is-executed-through.patch | 6 +-
0006-adding-javax.validation-to-build.xml.patch | 38 -
...OSS_BASE_DIR-is-checked-in-standalone.sh-.patch | 6 +-
...dding-org.jboss.metadata-to-minimal-build.patch | 115 ---
...le.patch => 0008-Remove-activation-module.patch | 57 +-
...ng-org.jboss.ejb3-module-to-minimal-build.patch | 71 --
...009-Use-properties-in-add-user-AS7-module.patch | 6 +-
0009-adding-org.jboss.as.logging.patch | 88 --
...rt-for-overriding-the-user-and-roles-prop.patch | 6 +-
0010-adding-org.hibernate.validator.patch | 66 --
...d-user.sh-mangles-permissions-of-mgmt-use.patch | 6 +-
...-org.jboss.remote-naming-to-minimal-build.patch | 67 --
...S7-4286-Fix-JavaCC-grammars-for-version-5.patch | 6 +-
0012-Enable-org.jboss.as.transactions-module.patch | 88 --
...er-jdt-requirement-it-was-replaced-by-ecj.patch | 57 ++
...e-of-HornetqJournalEnvironmentBean-in-Arj.patch | 47 -
0014-Disable-still-not-available-modules.patch | 26 +
...jboss.jboss-transaction-spi-to-minimal-bu.patch | 68 --
...emoved-unused-import-in-modcluster-module.patch | 24 +
0015-adding-jta-modules-to-minimal-build.patch | 85 --
0016-Remove-org.osgi.enterprise-dependency.patch | 78 ++
0016-adding-org.omg.api-to-minimal-build.patch | 36 -
...nforcer-exclusions-these-are-aliases-in-F.patch | 33 +-
0017-Enable-org.jboss.as.security-module.patch | 88 --
0018-Disable-Hibernate.patch | 41 +
...-of-org.jboss.as.clustering-module-infini.patch | 166 ----
0019-Add-jgroups-module.patch | 67 --
...sweb-native-dependency.-We-ll-have-unpack.patch | 29 +
0020-Add-infinispan-modules.patch | 121 ---
...enting-out-still-unavailable-dependencies.patch | 618 ++++++++++++++
0021-Added-jboss-jacc-api-module.patch | 67 --
0021-Disable-checkstyle-in-testsuite-too.patch | 52 ++
0022-Added-javax.servlet.api-module.patch | 67 --
0022-Disable-testsuites.patch | 27 +
0023-Added-org.jboss.as.jdr-module.patch | 100 +++
...ded-org.jboss.security.negotiation-module.patch | 125 ---
0024-Added-org.picketbox-module.patch | 91 --
0024-Make-AS7-work-with-jython-2.2.1.patch | 37 +
0025-Added-sun.jdk-module.patch | 33 -
...ve-javax.jws.api.-This-is-part-of-the-JDK.patch | 219 +++++
0026-Added-jboss-as-connector-AS7-module.patch | 88 --
...-as-web-jboss-as-clustering-api-jboss-as-.patch | 222 -----
...cip-org.jboss.ironjacamar-javax.resource..patch | 893 --------------------
0029-Make-some-modules-optional.patch | 133 ---
...-as-ejb3-jboss-as-weld-jboss-as-jpa-modul.patch | 503 -----------
...ed-additional-modules-required-on-runtime.patch | 303 -------
0032-Enabled-rest-of-clustering-submodules.patch | 165 ----
...ing-jmx-gid-reverting-rmi-changes-adding-.patch | 120 ---
0036-Added-jboss-as-cli-module.patch | 111 ---
0039-Added-domain-add-user-module.patch | 34 -
0045-Add-org.jboss.as.config-assembly-module.patch | 32 -
0046-Added-org.jboss.as.cmp-module.patch | 88 --
0048-Added-org.jboss.as.mail-module.patch | 88 --
0049-Added-org.jboss.as.jaxrs-module.patch | 290 -------
0050-Added-org.jboss.as.pojo-module.patch | 88 --
...-banned-deps-on-javax.xml.stream-stax-api.patch | 25 -
...sweb-native-dependency.-We-ll-have-unpack.patch | 29 -
...ncies-to-minimal-for-missing-modules-to-r.patch | 134 ---
0054-Added-org.jboss.as.sar-module.patch | 88 --
...Added-org.jboss.as.host-controller-module.patch | 88 --
...boss.as.webservices.server.integration-an.patch | 48 --
0057-Enable-jboss-as-ejb-client-bom.patch | 32 -
...Enabled-org.jboss.spec.javax.ws.rs-module.patch | 67 --
0059-Added-org.jboss.as.jaxr-module.patch | 100 ---
0060-Added-org.jboss.as.messaging-module.patch | 210 -----
0061-Runtime-dependencies.patch | 125 ---
0062-Added-org.jboss.as.modcluster-module.patch | 109 ---
0063-Enable-jboss-as-jms-client-bom.patch | 32 -
0064-Added-org.jboss.as.jsr77-module.patch | 134 ---
0065-Added-org.jboss.as.arquillian-module.patch | 32 -
0066-Added-org.jboss.as.osgi-module.patch | 206 -----
0067-Disable-for-now-ARQ-testng-integration.patch | 26 -
0068-Added-org.jboss.as.configadmin-module.patch | 88 --
jboss-as.spec | 244 ++++--
81 files changed, 1557 insertions(+), 6720 deletions(-)
---
diff --git a/0001-AS7-3724-DO-NOT-UPSTREAM-an-ugly-patch-to-remove-IIO.patch b/0001-AS7-3724-DO-NOT-UPSTREAM-an-ugly-patch-to-remove-IIO.patch
index 10d2cfd..97558d2 100644
--- a/0001-AS7-3724-DO-NOT-UPSTREAM-an-ugly-patch-to-remove-IIO.patch
+++ b/0001-AS7-3724-DO-NOT-UPSTREAM-an-ugly-patch-to-remove-IIO.patch
@@ -1,7 +1,7 @@
-From 927183315f53a5cfe590ace851888dcd280acbd9 Mon Sep 17 00:00:00 2001
+From 8acd55883b4e6e9aabbf0b740f1d08c91392c91b Mon Sep 17 00:00:00 2001
From: Carlo de Wolf <cdewolf at redhat.com>
Date: Wed, 15 Feb 2012 13:32:41 +0100
-Subject: [PATCH 01/43] AS7-3724: DO NOT UPSTREAM! an ugly patch to remove
+Subject: [PATCH 01/25] AS7-3724: DO NOT UPSTREAM! an ugly patch to remove
IIOP functionality
---
@@ -886,5 +886,5 @@ index 696d358..c92e3ca 100644
context.addStep(new AbstractDeploymentChainStep() {
protected void execute(final DeploymentProcessorTarget processorTarget) {
--
-1.7.10
+1.7.10.4
diff --git a/0002-Disable-checkstyle.patch b/0002-Disable-checkstyle.patch
index d72231b..8f35674 100644
--- a/0002-Disable-checkstyle.patch
+++ b/0002-Disable-checkstyle.patch
@@ -1,7 +1,7 @@
-From 44e68b35b47ca0ff9b4ee470cebe2c3522435e52 Mon Sep 17 00:00:00 2001
+From c58d3127467dfb10fc7b534757af4eca8801e2ef 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 02/43] Disable checkstyle
+Subject: [PATCH 02/25] Disable checkstyle
---
pom.xml | 33 ---------------------------------
@@ -59,5 +59,5 @@ index c4ea094..a9336c4 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
-1.7.10
+1.7.10.4
diff --git a/0003-Fix-initd-script.patch b/0003-Fix-initd-script.patch
index 55b4f16..813d419 100644
--- a/0003-Fix-initd-script.patch
+++ b/0003-Fix-initd-script.patch
@@ -1,7 +1,7 @@
-From d9ac6b0904ae011139e640afb31f60d17e54d7fa Mon Sep 17 00:00:00 2001
+From 4c999437d603f991316f3b8d9738b896c5b1bdcf Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann at fedoraproject.org>
Date: Thu, 26 Jan 2012 08:58:59 -0500
-Subject: [PATCH 03/43] Fix initd script
+Subject: [PATCH 03/25] Fix initd script
---
build/src/main/resources/bin/init.d/jboss-as.conf | 6 +++++-
@@ -29,5 +29,5 @@ index 0bfc942..72a356b 100644
+#
+JBOSS_CONFIG=standalone-minimalistic.xml
--
-1.7.10
+1.7.10.4
diff --git a/0034-Added-standalone-web.xml-example-configuration.-Use-.patch b/0004-Added-standalone-web.xml-example-configuration.-Use-.patch
similarity index 98%
rename from 0034-Added-standalone-web.xml-example-configuration.-Use-.patch
rename to 0004-Added-standalone-web.xml-example-configuration.-Use-.patch
index d5a8d4e..96bcc5b 100644
--- a/0034-Added-standalone-web.xml-example-configuration.-Use-.patch
+++ b/0004-Added-standalone-web.xml-example-configuration.-Use-.patch
@@ -1,7 +1,7 @@
-From 9421d18b63e3501147365b59e0caf1cfffdedfc0 Mon Sep 17 00:00:00 2001
+From e202e453392cb15a9ee8acf8b90b1023120d5c17 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 34/43] Added standalone-web.xml example configuration. Use
+Subject: [PATCH 04/25] Added standalone-web.xml example configuration. Use
this by default in Fedora.
---
@@ -254,5 +254,5 @@ index 0000000..02074d2
+
+</server>
--
-1.7.10
+1.7.10.4
diff --git a/0035-Add-systemd-files-re-arrange-directory-with-init-scr.patch b/0005-Add-systemd-files-re-arrange-directory-with-init-scr.patch
similarity index 98%
rename from 0035-Add-systemd-files-re-arrange-directory-with-init-scr.patch
rename to 0005-Add-systemd-files-re-arrange-directory-with-init-scr.patch
index b241685..07562d9 100644
--- a/0035-Add-systemd-files-re-arrange-directory-with-init-scr.patch
+++ b/0005-Add-systemd-files-re-arrange-directory-with-init-scr.patch
@@ -1,7 +1,7 @@
-From 5c8895b2f5819f34e82d05bbbed0a8c96b9767e3 Mon Sep 17 00:00:00 2001
+From 9c880056d9e84eba74c83542db12101979475c6e 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 35/43] Add systemd files, re-arrange directory with init
+Subject: [PATCH 05/25] Add systemd files, re-arrange directory with init
scripts
---
@@ -488,5 +488,5 @@ index 364dd9e..a3c32da 100755
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
--
-1.7.10
+1.7.10.4
diff --git a/0037-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch b/0006-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
similarity index 84%
rename from 0037-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
rename to 0006-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
index 4503159..8f6687b 100644
--- a/0037-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
+++ b/0006-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
@@ -1,7 +1,7 @@
-From 86e5a4857b5d8d33755e92b5ca05b87029985c30 Mon Sep 17 00:00:00 2001
+From 02794660bf30d4aa4093430da79a5886aa34ad7b 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 37/43] Fix JBOSS_HOME when jboss-cli.sh is executed through
+Subject: [PATCH 06/25] Fix JBOSS_HOME when jboss-cli.sh is executed through
symbolic link
---
@@ -27,5 +27,5 @@ index a9d1c5d..a1108f5 100755
# OS specific support (must be 'true' or 'false').
cygwin=false;
--
-1.7.10
+1.7.10.4
diff --git a/0038-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch b/0007-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
similarity index 88%
rename from 0038-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
rename to 0007-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
index a477265..7fc2384 100644
--- a/0038-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
+++ b/0007-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
@@ -1,7 +1,7 @@
-From b1f5a58e102b7e490b7bf9ed3d1837e29cd18924 Mon Sep 17 00:00:00 2001
+From 690b3b52e339491110168b97cf792152f7dcf3c5 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 38/43] [AS7-3800] JBOSS_BASE_DIR is checked in standalone.sh
+Subject: [PATCH 07/25] [AS7-3800] JBOSS_BASE_DIR is checked in standalone.sh
but not used to set -Djboss.server.base.dir
---
@@ -29,5 +29,5 @@ index a3c32da..80b95c5 100755
JBOSS_PID=$!
# Trap common signals and relay them to the jboss process
--
-1.7.10
+1.7.10.4
diff --git a/0040-Remove-activation-module.patch b/0008-Remove-activation-module.patch
similarity index 86%
rename from 0040-Remove-activation-module.patch
rename to 0008-Remove-activation-module.patch
index ac3bde7..89b6d41 100644
--- a/0040-Remove-activation-module.patch
+++ b/0008-Remove-activation-module.patch
@@ -1,7 +1,7 @@
-From c95955b6aaccccb14f73e6935be4602d544acafd Mon Sep 17 00:00:00 2001
+From 1f913d56bd0c7e4ad7a12c811c0c73a8eefde61e 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 40/43] Remove activation module
+Subject: [PATCH 08/25] Remove activation module
---
build/build.xml | 4 --
@@ -13,32 +13,33 @@ Subject: [PATCH 40/43] Remove activation module
.../modules/javax/mail/api/main/module.xml | 1 -
.../modules/javax/xml/bind/api/main/module.xml | 1 -
.../modules/javax/xml/registry/api/main/module.xml | 2 +-
+ .../modules/javax/xml/soap/api/main/module.xml | 1 -
.../codehaus/jackson/jackson-xc/main/module.xml | 3 +-
.../jboss/resteasy/resteasy-jaxrs/main/module.xml | 1 -
pom.xml | 7 ----
- 12 files changed, 3 insertions(+), 78 deletions(-)
+ 13 files changed, 3 insertions(+), 79 deletions(-)
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 4bbc1ab..f637bb1 100644
+index 4c56cf3..762830d 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -707,10 +707,6 @@
- <maven-resource group="gnu-getopt" artifact="getopt" />
- </module-def>
+@@ -340,10 +340,6 @@
+
+ <module-def name="javaee.api"/>
- <module-def name="javax.activation.api">
- <maven-resource group="javax.activation" artifact="activation"/>
- </module-def>
-
- <module-def name="javax.faces.api" slot="1.2">
- <maven-resource group="javax.faces" artifact="jsf-api"/>
+ <module-def name="javax.annotation.api">
+ <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 e826cb8..6fc687f 100644
+index 5bc6527..b3f1a2e 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -779,11 +779,6 @@
+@@ -300,11 +300,6 @@
-->
<dependency>
@@ -47,8 +48,8 @@ index e826cb8..6fc687f 100644
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
</dependency>
diff --git a/build/src/license/licenses.xml b/build/src/license/licenses.xml
index 5ff098a..a1bf243 100644
@@ -78,14 +79,14 @@ index 5ff098a..a1bf243 100644
<artifactId>cdi-api</artifactId>
<licenses>
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 40c62e4..fb439ce 100644
+index 5f599df..a0c5f12 100644
--- a/build/src/main/resources/modules/javaee/api/main/module.xml
+++ b/build/src/main/resources/modules/javaee/api/main/module.xml
@@ -28,7 +28,6 @@
</resources>
<dependencies>
-- <!-- <module name="javax.activation.api" export="true"/> is in JDK -->
+- <module name="javax.activation.api" export="true"/>
<module name="javax.annotation.api" export="true"/>
<module name="javax.ejb.api" export="true"/>
<module name="javax.el.api" export="true"/>
@@ -147,26 +148,26 @@ index 5470de4..3206521 100644
<path name="javax/crypto/interfaces"/>
<path name="javax/crypto/spec"/>
diff --git a/build/src/main/resources/modules/javax/mail/api/main/module.xml b/build/src/main/resources/modules/javax/mail/api/main/module.xml
-index 1b60ac1..59b2f5a 100644
+index 12a0c85..59b2f5a 100644
--- a/build/src/main/resources/modules/javax/mail/api/main/module.xml
+++ b/build/src/main/resources/modules/javax/mail/api/main/module.xml
@@ -24,7 +24,6 @@
<module xmlns="urn:jboss:module:1.1" name="javax.mail.api">
<dependencies>
-- <module name="javax.activation.api" optional="true"/>
+- <module name="javax.activation.api" />
<module name="javax.api"/>
</dependencies>
diff --git a/build/src/main/resources/modules/javax/xml/bind/api/main/module.xml b/build/src/main/resources/modules/javax/xml/bind/api/main/module.xml
-index 6376d6f..d68235c 100644
+index ccb597c..d68235c 100644
--- a/build/src/main/resources/modules/javax/xml/bind/api/main/module.xml
+++ b/build/src/main/resources/modules/javax/xml/bind/api/main/module.xml
@@ -26,7 +26,6 @@
<dependencies>
-- <!-- <module name="javax.activation.api" export="true"/> is in JDK -->
+- <module name="javax.activation.api" export="true"/>
<module name="javax.xml.stream.api"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="javax.api"/>
@@ -183,6 +184,18 @@ index 0b4a509..c49fde8 100644
</dependencies>
<resources>
+diff --git a/build/src/main/resources/modules/javax/xml/soap/api/main/module.xml b/build/src/main/resources/modules/javax/xml/soap/api/main/module.xml
+index f65c518..20c547c 100644
+--- a/build/src/main/resources/modules/javax/xml/soap/api/main/module.xml
++++ b/build/src/main/resources/modules/javax/xml/soap/api/main/module.xml
+@@ -24,7 +24,6 @@
+
+ <module xmlns="urn:jboss:module:1.1" name="javax.xml.soap.api">
+ <dependencies>
+- <module name="javax.activation.api" export="true"/>
+ <module name="javax.api"/>
+ <module name="org.jboss.modules"/>
+ </dependencies>
diff --git a/build/src/main/resources/modules/org/codehaus/jackson/jackson-xc/main/module.xml b/build/src/main/resources/modules/org/codehaus/jackson/jackson-xc/main/module.xml
index 2c5b473..3a9ea01 100644
--- a/build/src/main/resources/modules/org/codehaus/jackson/jackson-xc/main/module.xml
@@ -212,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 716b45d..c45f875 100644
+index a9336c4..800fcd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,6 @@
@@ -223,7 +236,7 @@ index 716b45d..c45f875 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>
-@@ -1313,12 +1312,6 @@
+@@ -1299,12 +1298,6 @@
</dependency>
<dependency>
@@ -237,5 +250,5 @@ index 716b45d..c45f875 100644
<artifactId>cdi-api</artifactId>
<version>${version.javax.enterprise}</version>
--
-1.7.10
+1.7.10.4
diff --git a/0041-Use-properties-in-add-user-AS7-module.patch b/0009-Use-properties-in-add-user-AS7-module.patch
similarity index 99%
rename from 0041-Use-properties-in-add-user-AS7-module.patch
rename to 0009-Use-properties-in-add-user-AS7-module.patch
index 1fbcd17..0315e49 100644
--- a/0041-Use-properties-in-add-user-AS7-module.patch
+++ b/0009-Use-properties-in-add-user-AS7-module.patch
@@ -1,7 +1,7 @@
-From a092b24a4395bcf9e7f5af6eb627c314364c5516 Mon Sep 17 00:00:00 2001
+From 0ed08613fbf5f1d026309b4ce8896bc380311759 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 41/43] Use properties in add-user AS7 module
+Subject: [PATCH 09/25] Use properties in add-user AS7 module
---
.../management/DomainManagementMessages.java | 51 +-
@@ -2525,5 +2525,5 @@ index 0000000..4c7d094
+}
\ No newline at end of file
--
-1.7.10
+1.7.10.4
diff --git a/0042-added-support-for-overriding-the-user-and-roles-prop.patch b/0010-added-support-for-overriding-the-user-and-roles-prop.patch
similarity index 99%
rename from 0042-added-support-for-overriding-the-user-and-roles-prop.patch
rename to 0010-added-support-for-overriding-the-user-and-roles-prop.patch
index 5930beb..5856691 100644
--- a/0042-added-support-for-overriding-the-user-and-roles-prop.patch
+++ b/0010-added-support-for-overriding-the-user-and-roles-prop.patch
@@ -1,7 +1,7 @@
-From 0c62c5d389aac0429cf0ed5dc8d54ee5d6b20c8f Mon Sep 17 00:00:00 2001
+From e4aa48a19be0a587962e5d75f47c9f7f735c6f79 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 42/43] added support for overriding the user and roles
+Subject: [PATCH 10/25] 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
@@ -355,5 +355,5 @@ index 0000000..81689d1
+
+}
--
-1.7.10
+1.7.10.4
diff --git a/0043-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch b/0011-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
similarity index 96%
rename from 0043-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
rename to 0011-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
index 794aaca..764637a 100644
--- a/0043-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
+++ b/0011-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
@@ -1,7 +1,7 @@
-From 3d7337e0800d84cd6c5ff7f5866a1b17e4628ad0 Mon Sep 17 00:00:00 2001
+From e4eb19be3408a137d08942feddd569f8cf70ce73 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 43/43] [AS7-4536] add-user.sh mangles permissions of
+Subject: [PATCH 11/25] [AS7-4536] add-user.sh mangles permissions of
mgmt-users.properties
---
@@ -95,5 +95,5 @@ index 38737cb..9c4bad9 100644
try {
c.close();
--
-1.7.10
+1.7.10.4
diff --git a/0047-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch b/0012-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
similarity index 97%
rename from 0047-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
rename to 0012-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
index 0223ce8..98f7496 100644
--- a/0047-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
+++ b/0012-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
@@ -1,7 +1,7 @@
-From e14b89117c2a979fb90f8231cf44975ce0afd9c0 Mon Sep 17 00:00:00 2001
+From 43ed974a5aa06624a6d1b58bf5821689d61e2c46 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 47/47] [AS7-4286] Fix JavaCC grammars for version 5.
+Subject: [PATCH 12/25] [AS7-4286] Fix JavaCC grammars for version 5.
The JBossQL en EJBQL grammars used for CMP use some tokens with
empty regular expressions. This worked with JavaCC 4 but doesn't
@@ -140,5 +140,5 @@ index 116f86b..51f996f 100644
+| < COLLECTION_VALUED_PATH: "COLLECTION_VALUED_PATH" >
+}
--
-1.7.10
+1.7.10.4
diff --git a/0013-Remove-jasper-jdt-requirement-it-was-replaced-by-ecj.patch b/0013-Remove-jasper-jdt-requirement-it-was-replaced-by-ecj.patch
new file mode 100644
index 0000000..ae64766
--- /dev/null
+++ b/0013-Remove-jasper-jdt-requirement-it-was-replaced-by-ecj.patch
@@ -0,0 +1,57 @@
+From e18d566742c0d10420635b1f0487d1c2ff4ec1c3 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 13/25] Remove jasper-jdt requirement, it was replaced by ecj
+ in Fedora
+
+---
+ build/build.xml | 1 -
+ build/pom.xml | 4 ++--
+ web/pom.xml | 4 ++--
+ 3 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 762830d..a825a08 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -868,7 +868,6 @@
+
+ <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.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 b3f1a2e..e9381fd 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -1462,8 +1462,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/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>
+--
+1.7.10.4
+
diff --git a/0014-Disable-still-not-available-modules.patch b/0014-Disable-still-not-available-modules.patch
new file mode 100644
index 0000000..c3fbdc5
--- /dev/null
+++ b/0014-Disable-still-not-available-modules.patch
@@ -0,0 +1,26 @@
+From f7e7a6f0d61683a4b8c28c060225365aad5bf0cc Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Tue, 19 Jun 2012 10:46:29 +0200
+Subject: [PATCH 14/25] Disable still not available modules
+
+---
+ pom.xml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index 800fcd7..ae8ca34 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -5969,7 +5969,9 @@
+ -->
+ <module>jaxr</module>
+ <module>jaxrs</module>
++ <!--
+ <module>jdr</module>
++ -->
+ <module>jpa</module>
+ <module>jsr77</module>
+ <module>logging</module>
+--
+1.7.10.4
+
diff --git a/0015-Removed-unused-import-in-modcluster-module.patch b/0015-Removed-unused-import-in-modcluster-module.patch
new file mode 100644
index 0000000..fb92790
--- /dev/null
+++ b/0015-Removed-unused-import-in-modcluster-module.patch
@@ -0,0 +1,24 @@
+From 62edea479114cd7efdd84fed98606b0c53d628e3 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 15/25] Removed unused import in modcluster module
+
+---
+ .../src/main/java/org/jboss/as/modcluster/ModClusterSubsystemAdd.java | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/modcluster/src/main/java/org/jboss/as/modcluster/ModClusterSubsystemAdd.java b/modcluster/src/main/java/org/jboss/as/modcluster/ModClusterSubsystemAdd.java
+index 71cdff4..b00b073 100644
+--- a/modcluster/src/main/java/org/jboss/as/modcluster/ModClusterSubsystemAdd.java
++++ b/modcluster/src/main/java/org/jboss/as/modcluster/ModClusterSubsystemAdd.java
+@@ -46,7 +46,6 @@ import org.jboss.modcluster.config.impl.ModClusterConfig;
+ import org.jboss.msc.service.ServiceBuilder;
+ import org.jboss.msc.service.ServiceController;
+ import org.jboss.msc.service.ServiceController.Mode;
+-import org.omg.CosCollection.Command;
+
+ /**
+ * The managed subsystem add update.
+--
+1.7.10.4
+
diff --git a/0016-Remove-org.osgi.enterprise-dependency.patch b/0016-Remove-org.osgi.enterprise-dependency.patch
new file mode 100644
index 0000000..110ced7
--- /dev/null
+++ b/0016-Remove-org.osgi.enterprise-dependency.patch
@@ -0,0 +1,78 @@
+From fe01d291b864a085aa29f15b409c40063f689968 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 16/25] Remove org.osgi.enterprise dependency
+
+---
+ build/pom.xml | 5 -----
+ osgi/service/pom.xml | 4 ----
+ pom.xml | 6 ------
+ spec-api/pom.xml | 4 ----
+ 4 files changed, 19 deletions(-)
+
+diff --git a/build/pom.xml b/build/pom.xml
+index e9381fd..a1c82e8 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -1583,11 +1583,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.osgi</groupId>
+- <artifactId>org.osgi.enterprise</artifactId>
+- </dependency>
+-
+- <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed</artifactId>
+ </dependency>
+diff --git a/osgi/service/pom.xml b/osgi/service/pom.xml
+index f20f5be..338da61 100644
+--- a/osgi/service/pom.xml
++++ b/osgi/service/pom.xml
+@@ -90,10 +90,6 @@
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+- <dependency>
+- <groupId>org.osgi</groupId>
+- <artifactId>org.osgi.enterprise</artifactId>
+- </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+diff --git a/pom.xml b/pom.xml
+index ae8ca34..c613f00 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -5633,12 +5633,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.osgi</groupId>
+- <artifactId>org.osgi.enterprise</artifactId>
+- <version>${version.osgi}</version>
+- </dependency>
+-
+- <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>picketbox</artifactId>
+ <version>${version.org.picketbox}</version>
+diff --git a/spec-api/pom.xml b/spec-api/pom.xml
+index fbd99b2..a1005c8 100644
+--- a/spec-api/pom.xml
++++ b/spec-api/pom.xml
+@@ -129,10 +129,6 @@
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+- <groupId>org.osgi</groupId>
+- <artifactId>org.osgi.enterprise</artifactId>
+- </dependency>
+- <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+--
+1.7.10.4
+
diff --git a/0044-Removing-some-banned-deps-as-in-Fedora-those-are-jus.patch b/0017-Drop-some-enforcer-exclusions-these-are-aliases-in-F.patch
similarity index 54%
rename from 0044-Removing-some-banned-deps-as-in-Fedora-those-are-jus.patch
rename to 0017-Drop-some-enforcer-exclusions-these-are-aliases-in-F.patch
index f06a00d..00d45cd 100644
--- a/0044-Removing-some-banned-deps-as-in-Fedora-those-are-jus.patch
+++ b/0017-Drop-some-enforcer-exclusions-these-are-aliases-in-F.patch
@@ -1,31 +1,32 @@
-From 532bb0be93780e3d374ea3fa5c6ead54bc8f73f7 Mon Sep 17 00:00:00 2001
+From 79965aee34da1fdffa6c7b774b829c999b8303d3 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
-Date: Tue, 21 Feb 2012 18:35:01 +0100
-Subject: [PATCH 44/44] Removing some banned deps as in Fedora those are just
- aliases
+Date: Tue, 19 Jun 2012 11:37:29 +0200
+Subject: [PATCH 17/25] Drop some enforcer exclusions, these are aliases in
+ Fedora
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
-index c45f875..bd0f6e6 100644
+index c613f00..3691619 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -401,10 +401,10 @@
- <exclude>com.gwtplatform:gwtp-all</exclude>
- <exclude>commons-httpclient:commons-httpclient</exclude>
- <exclude>commons-logging:commons-logging</exclude>
-- <exclude>concurrent:concurrent</exclude>
-+ <!-- <exclude>concurrent:concurrent</exclude> PicketBox uses oswego-concurrent:concurrent, in Fedora it's just an alias -->
+@@ -391,11 +391,11 @@
<exclude>jacorb:jacorb</exclude>
<exclude>javassist:javassist</exclude>
-- <exclude>javax.persistence:persistence-api</exclude>
-+ <!-- <exclude>javax.persistence:persistence-api</exclude> Needs investigation -->
- <exclude>javax.servlet:servlet-api</exclude>
+ <exclude>javax.persistence:persistence-api</exclude>
+- <exclude>javax.servlet:servlet-api</exclude>
++ <!-- <exclude>javax.servlet:servlet-api</exclude> Pulled in by org.osgi:org.osgi.compendium, alias -->
<exclude>javax.transaction:jta</exclude>
<exclude>javax.xml:jaxrpc-api</exclude>
-@@ -461,7 +461,7 @@
+ <exclude>javax.xml.soap:saaj-api</exclude>
+- <exclude>javax.xml.stream:stax-api</exclude>
++ <!-- <exclude>javax.xml.stream:stax-api</exclude> this is pulled by resteasy deps -->
+ <exclude>jboss:jboss-logging-spi</exclude>
+ <exclude>jboss:jboss-serialization</exclude>
+ <exclude>jboss.web:el-api</exclude>
+@@ -447,7 +447,7 @@
<exclude>sun-jaxb:jaxb-api</exclude>
<exclude>trove:trove</exclude>
<exclude>woodstox:wstx-lgpl</exclude>
@@ -35,5 +36,5 @@ index c45f875..bd0f6e6 100644
</bannedDependencies>
</rules>
--
-1.7.10
+1.7.10.4
diff --git a/0018-Disable-Hibernate.patch b/0018-Disable-Hibernate.patch
new file mode 100644
index 0000000..31121ba
--- /dev/null
+++ b/0018-Disable-Hibernate.patch
@@ -0,0 +1,41 @@
+From 7004cd7e6a219108a191fbd1378d37776daa2e3e Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Tue, 19 Jun 2012 11:51:50 +0200
+Subject: [PATCH 18/25] Disable Hibernate
+
+---
+ build/src/main/resources/modules/org/jboss/as/ejb3/main/module.xml | 1 -
+ jpa/pom.xml | 2 ++
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/build/src/main/resources/modules/org/jboss/as/ejb3/main/module.xml b/build/src/main/resources/modules/org/jboss/as/ejb3/main/module.xml
+index 4785e5f..aa6f843 100644
+--- a/build/src/main/resources/modules/org/jboss/as/ejb3/main/module.xml
++++ b/build/src/main/resources/modules/org/jboss/as/ejb3/main/module.xml
+@@ -40,7 +40,6 @@
+ <!-- For message inflow -->
+ <module name="javax.resource.api"/>
+ <module name="javax.rmi.api"/>
+- <module name="org.hibernate"/>
+ <module name="org.jacorb" optional="true"/>
+ <module name="org.jboss.as.clustering.api"/>
+ <module name="org.jboss.as.clustering.ejb3.infinispan" services="import" optional="true"/>
+diff --git a/jpa/pom.xml b/jpa/pom.xml
+index 09dd27e..462e1ed 100644
+--- a/jpa/pom.xml
++++ b/jpa/pom.xml
+@@ -44,9 +44,11 @@
+ <module>core</module>
+ <module>util</module>
+ <module>spi</module>
++ <!--
+ <module>hibernate4</module>
+ <module>hibernate3</module>
+ <module>openjpa</module>
++ -->
+ </modules>
+
+ <dependencies>
+--
+1.7.10.4
+
diff --git a/0019-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch b/0019-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch
new file mode 100644
index 0000000..b0036fb
--- /dev/null
+++ b/0019-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch
@@ -0,0 +1,29 @@
+From 4d64b44f3f247d5fa35e0ed13902903ffaa9a490 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 19/25] 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
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -144,11 +144,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.jboss.as</groupId>
+- <artifactId>jbossweb-native</artifactId>
+- </dependency>
+-
+- <dependency>
+ <groupId>org.jboss.invocation</groupId>
+ <artifactId>jboss-invocation</artifactId>
+ </dependency>
+--
+1.7.10.4
+
diff --git a/0020-Commenting-out-still-unavailable-dependencies.patch b/0020-Commenting-out-still-unavailable-dependencies.patch
new file mode 100644
index 0000000..f6edfef
--- /dev/null
+++ b/0020-Commenting-out-still-unavailable-dependencies.patch
@@ -0,0 +1,618 @@
+From 34f21424e3e4bbf9d61267e3ed5980a0ef102b15 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Tue, 19 Jun 2012 13:22:27 +0200
+Subject: [PATCH 20/25] Commenting out still unavailable dependencies
+
+---
+ build/build.xml | 46 +++++++++++++++++++++++++++++++++++++++++++---
+ build/pom.xml | 46 +++++++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 86 insertions(+), 6 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index a825a08..8ad359c 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -86,7 +86,7 @@
+
+ <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 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/">
+@@ -317,26 +317,32 @@
+ <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"/>
+ <maven-resource group="com.sun.xml.bind" artifact="jaxb-xjc"/>
+ </module-def>
+
++ <!--
+ <module-def name="com.sun.xml.messaging.saaj">
+ <maven-resource group="com.sun.xml.messaging.saaj" artifact="saaj-impl"/>
+ </module-def>
++ -->
+
+ <module-def name="org.dom4j">
+ <maven-resource group="dom4j" artifact="dom4j" />
+ </module-def>
+
++ <!--
+ <module-def name="gnu.getopt">
+ <maven-resource group="gnu-getopt" artifact="getopt" />
+ </module-def>
++ -->
+
+ <module-def name="javaee.api"/>
+
+@@ -364,9 +370,11 @@
+ <maven-resource group="org.jboss.spec.javax.faces" artifact="jboss-jsf-api_2.1_spec"/>
+ </module-def>
+
++ <!--
+ <module-def name="javax.faces.api" slot="1.2">
+ <maven-resource group="javax.faces" artifact="jsf-api"/>
+ </module-def>
++ -->
+
+ <module-def name="javax.inject.api">
+ <maven-resource group="javax.inject" artifact="javax.inject"/>
+@@ -380,9 +388,11 @@
+ <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"/>
+@@ -508,6 +518,7 @@
+ <maven-resource group="commons-pool" artifact="commons-pool"/>
+ </module-def>
+
++ <!--
+ <module-def name="org.apache.cxf">
+ <maven-resource group="org.apache.cxf" artifact="cxf-api"/>
+ <maven-resource group="org.apache.cxf" artifact="cxf-common-utilities"/>
+@@ -540,6 +551,7 @@
+ <maven-resource group="org.apache.cxf.xjcplugins" artifact="cxf-xjc-dv"/>
+ <maven-resource group="org.apache.cxf.xjcplugins" artifact="cxf-xjc-ts"/>
+ </module-def>
++ -->
+
+ <module-def name="org.apache.httpcomponents">
+ <!-- These probably do not need to be split up but we can revisit later -->
+@@ -549,7 +561,7 @@
+ </module-def>
+
+ <module-def name="org.apache.james.mime4j">
+- <maven-resource group="org.apache.james" artifact="apache-mime4j"/>
++ <maven-resource group="org.apache.james" artifact="apache-mime4j-core"/>
+ </module-def>
+
+ <module-def name="org.apache.juddi.juddi-client">
+@@ -589,9 +601,11 @@
+ <maven-resource group="xml-resolver" artifact="xml-resolver"/>
+ </module-def>
+
++ <!--
+ <module-def name="org.apache.ws.xmlschema">
+ <maven-resource group="org.apache.ws.xmlschema" artifact="xmlschema-core"/>
+ </module-def>
++ -->
+
+ <module-def name="org.apache.ws.security">
+ <maven-resource group="org.apache.ws.security" artifact="wss4j"/>
+@@ -622,6 +636,7 @@
+ <maven-resource group="org.codehaus.jettison" artifact="jettison" />
+ </module-def>
+
++ <!--
+ <module-def name="org.hibernate">
+ <maven-resource group="org.hibernate" artifact="hibernate-core" />
+ <maven-resource group="org.hibernate.common" artifact="hibernate-commons-annotations" />
+@@ -632,6 +647,8 @@
+ <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>
+@@ -685,9 +702,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"/>
+@@ -789,15 +808,18 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jaxrs"/>
+ </module-def>
+
++ <!--
+ <module-def name="org.jboss.as.jdr">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jdr"/>
+ <maven-resource group="org.jboss.as" artifact="jboss-as-sos"/>
+ </module-def>
++ -->
+
+ <module-def name="org.jboss.as.jpa">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jpa"/>
+ </module-def>
+
++ <!--
+ <module-def name="org.jboss.as.jpa.hibernate" slot="3">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jpa-hibernate3"/>
+ </module-def>
+@@ -809,6 +831,7 @@
+ <module-def name="org.jboss.as.jpa.openjpa">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jpa-openjpa"/>
+ </module-def>
++ -->
+
+ <module-def name="org.jboss.as.jpa.spi">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jpa-spi"/>
+@@ -869,7 +892,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="jbossweb"/>
+- <extract-native-jar group="org.jboss.as" artifact="jbossweb-native"/>
++ <!-- <extract-native-jar group="org.jboss.as" artifact="jbossweb-native"/> -->
+ </module-def>
+
+ <module-def name="org.jboss.as.webservices">
+@@ -888,9 +911,12 @@
+ <module-def name="org.jboss.as.weld">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-weld"/>
+ </module-def>
++
++ <!--
+ <module-def name="org.jboss.as.xts">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-xts"/>
+ </module-def>
++ -->
+
+ <module-def name="org.jboss.classfilewriter">
+ <maven-resource group="org.jboss.classfilewriter" artifact="jboss-classfilewriter"/>
+@@ -1068,6 +1094,7 @@
+ <maven-resource group="org.jboss.ws" artifact="jbossws-common"/>
+ </module-def>
+
++ <!--
+ <module-def name="org.jboss.ws.cxf.jbossws-cxf-client"/>
+
+ <module-def name="org.jboss.ws.cxf.jbossws-cxf-factories">
+@@ -1101,6 +1128,7 @@
+ <module-def name="org.jboss.ws.native.jbossws-native-services">
+ <maven-resource group="org.jboss.ws.native" artifact="jbossws-native-services"/>
+ </module-def>
++ -->
+
+ <module-def name="org.jboss.ws.api">
+ <maven-resource group="org.jboss.ws" artifact="jbossws-api"/>
+@@ -1110,9 +1138,11 @@
+ <maven-resource group="org.jboss.ws" artifact="jbossws-spi"/>
+ </module-def>
+
++ <!--
+ <module-def name="org.jboss.ws.tools.common">
+ <maven-resource group="org.jboss.ws" artifact="jbossws-common-tools"/>
+ </module-def>
++ -->
+
+ <module-def name="org.jboss.ws.saaj-impl">
+ </module-def>
+@@ -1123,6 +1153,7 @@
+ <module-def name="org.jboss.ws.tools.wsconsume">
+ </module-def>
+
++ <!--
+ <module-def name="org.jboss.xb">
+ <maven-resource group="org.jboss" artifact="jbossxb"/>
+ </module-def>
+@@ -1132,6 +1163,7 @@
+ <maven-resource group="org.jboss.jbossts" artifact="jbossxts-api"/>
+ <maven-resource group="org.jboss.jbossts" artifact="jbosstxbridge"/>
+ </module-def>
++ -->
+
+ <module-def name="org.jgroups">
+ <maven-resource group="org.jgroups" artifact="jgroups"/>
+@@ -1147,11 +1179,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"/>
+@@ -1159,9 +1193,11 @@
+ <maven-resource group="org.picketbox" artifact="picketbox-commons"/>
+ </module-def>
+
++ <!--
+ <module-def name="org.python.jython.standalone">
+ <maven-resource group="org.python" artifact="jython-standalone"/>
+ </module-def>
++ -->
+
+ <module-def name="org.slf4j.jcl-over-slf4j">
+ <maven-resource group="org.slf4j" artifact="jcl-over-slf4j"/>
+@@ -1209,9 +1245,11 @@
+ <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"/>
+@@ -1221,6 +1259,7 @@
+ <maven-bundle group="org.jboss.osgi.http" artifact="jbosgi-http-api"/>
+ </bundle-def>
+
++ <!--
+ <bundle-def name="org.jboss.osgi.logging">
+ <maven-bundle group="org.jboss.osgi.logging" artifact="jboss-osgi-logging"/>
+ </bundle-def>
+@@ -1228,6 +1267,7 @@
+ <bundle-def name="org.osgi.enterprise">
+ <maven-bundle group="org.osgi" artifact="org.osgi.enterprise"/>
+ </bundle-def>
++ -->
+
+ <bundle-def name="org.projectodd.stilts">
+ <maven-bundle group="org.projectodd.stilts" artifact="stilts-stomplet-server-bundle"/>
+diff --git a/build/pom.xml b/build/pom.xml
+index bc6078e..2928f16 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -237,10 +237,12 @@
+ <artifactId>jaxb-xjc</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+@@ -282,12 +284,12 @@
+ <artifactId>dom4j</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>gnu-getopt</groupId>
+ <artifactId>getopt</artifactId>
+ </dependency>
+
+- <!--
+ <dependency>
+ <groupId>org.jacorb</groupId>
+ <artifactId>jacorb</artifactId>
+@@ -299,6 +301,7 @@
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+@@ -308,16 +311,19 @@
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+@@ -364,6 +370,7 @@
+ <artifactId>nekohtml</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+@@ -513,16 +520,19 @@
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-ts</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <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>
+@@ -541,7 +551,7 @@
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+- <artifactId>apache-mime4j</artifactId>
++ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+
+ <dependency>
+@@ -559,10 +569,12 @@
+ <artifactId>scout</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+@@ -609,6 +621,7 @@
+ <artifactId>stax2-api</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+@@ -628,16 +641,19 @@
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-infinispan</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-envers</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+@@ -785,11 +801,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>
+@@ -856,10 +874,12 @@
+ <artifactId>jboss-as-jaxrs</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-jdr</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+@@ -948,10 +968,12 @@
+ <artifactId>jboss-as-security</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-sos</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+@@ -1015,6 +1037,7 @@
+ <artifactId>jboss-as-jpa</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-jpa-hibernate3</artifactId>
+@@ -1029,6 +1052,7 @@
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-jpa-openjpa</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+@@ -1110,12 +1134,12 @@
+ <artifactId>jbossjta-integration</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>jbosstxbridge</artifactId>
+ </dependency>
+
+- <!--
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>jbossxts</artifactId>
+@@ -1186,6 +1210,7 @@
+ <artifactId>jbosgi-framework-core</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss.osgi.http</groupId>
+ <artifactId>jbosgi-http-api</artifactId>
+@@ -1195,6 +1220,7 @@
+ <groupId>org.jboss.osgi.logging</groupId>
+ <artifactId>jboss-osgi-logging</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.jboss.osgi.repository</groupId>
+@@ -1281,10 +1307,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>
+@@ -1491,16 +1519,19 @@
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common-tools</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss.ws.projects</groupId>
+ <artifactId>jaxws-jboss-httpserver-httpspi</artifactId>
+@@ -1515,6 +1546,7 @@
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+@@ -1522,6 +1554,7 @@
+ <classifier>jboss711</classifier>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
+@@ -1546,6 +1579,7 @@
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native-services</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+@@ -1557,10 +1591,12 @@
+ <artifactId>xnio-nio</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.jdom</groupId>
+@@ -1577,6 +1613,7 @@
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-fed</artifactId>
+@@ -1596,6 +1633,7 @@
+ <groupId>org.projectodd.stilts</groupId>
+ <artifactId>stilts-stomplet-server-bundle</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.scannotation</groupId>
+@@ -1617,10 +1655,12 @@
+ <artifactId>picketbox-infinispan</artifactId>
+ </dependency>
+
++ <!--
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython-standalone</artifactId>
+ </dependency>
++ -->
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+--
+1.7.10.4
+
diff --git a/0021-Disable-checkstyle-in-testsuite-too.patch b/0021-Disable-checkstyle-in-testsuite-too.patch
new file mode 100644
index 0000000..c9fa051
--- /dev/null
+++ b/0021-Disable-checkstyle-in-testsuite-too.patch
@@ -0,0 +1,52 @@
+From 2fcfcab5556e34c3a1a5093715f0a3ee55541754 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 21/25] Disable checkstyle in testsuite too
+
+---
+ testsuite/shared/pom.xml | 29 -----------------------------
+ 1 file changed, 29 deletions(-)
+
+diff --git a/testsuite/shared/pom.xml b/testsuite/shared/pom.xml
+index d1af58a..4124cb1 100644
+--- a/testsuite/shared/pom.xml
++++ b/testsuite/shared/pom.xml
+@@ -27,35 +27,6 @@
+ <version.saxon>8.7</version.saxon>
+ </properties>
+
+- <build>
+- <plugins>
+- <plugin>
+- <groupId>org.apache.maven.plugins</groupId>
+- <artifactId>maven-checkstyle-plugin</artifactId>
+- <configuration>
+- <!-- TODO: Don't fail on checkstyle until AS7-2954 is fixed. -->
+- <failsOnError>false</failsOnError>
+- </configuration>
+-
+- <executions>
+- <execution>
+- <id>check-style-ts-shared</id>
+- <phase>compile</phase>
+- <goals><goal>checkstyle</goal></goals>
+- <configuration>
+- <configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
+- <consoleOutput>true</consoleOutput>
+- <failsOnError>false</failsOnError>
+- <useFile/>
+- </configuration>
+- </execution>
+- </executions>
+-
+- </plugin>
+- </plugins>
+- </build>
+-
+-
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+--
+1.7.10.4
+
diff --git a/0022-Disable-testsuites.patch b/0022-Disable-testsuites.patch
new file mode 100644
index 0000000..8acd4d0
--- /dev/null
+++ b/0022-Disable-testsuites.patch
@@ -0,0 +1,27 @@
+From 15708bab207d1e0883d82c8c01d734e84997245c 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 22/25] Disable testsuites
+
+---
+ pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index 3691619..aaef12a 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -5985,9 +5985,9 @@
+ <module>weld</module>
+ <!--
+ <module>xts</module>
+- -->
+ <module>testsuite/shared</module>
+ <module>testsuite</module>
++ -->
+ </modules>
+ </profile>
+ </profiles>
+--
+1.7.10.4
+
diff --git a/0023-Added-org.jboss.as.jdr-module.patch b/0023-Added-org.jboss.as.jdr-module.patch
new file mode 100644
index 0000000..dfa9e38
--- /dev/null
+++ b/0023-Added-org.jboss.as.jdr-module.patch
@@ -0,0 +1,100 @@
+From 6cea5b2ac5e33bbdde69211ab76ce18e2642342a Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Tue, 19 Jun 2012 19:21:43 +0200
+Subject: [PATCH 23/25] Added org.jboss.as.jdr module
+
+---
+ build/build.xml | 4 ----
+ build/pom.xml | 6 ------
+ pom.xml | 2 --
+ 3 files changed, 12 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 8ad359c..63995ba 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -808,12 +808,10 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jaxrs"/>
+ </module-def>
+
+- <!--
+ <module-def name="org.jboss.as.jdr">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jdr"/>
+ <maven-resource group="org.jboss.as" artifact="jboss-as-sos"/>
+ </module-def>
+- -->
+
+ <module-def name="org.jboss.as.jpa">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jpa"/>
+@@ -1193,11 +1191,9 @@
+ <maven-resource group="org.picketbox" artifact="picketbox-commons"/>
+ </module-def>
+
+- <!--
+ <module-def name="org.python.jython.standalone">
+ <maven-resource group="org.python" artifact="jython-standalone"/>
+ </module-def>
+- -->
+
+ <module-def name="org.slf4j.jcl-over-slf4j">
+ <maven-resource group="org.slf4j" artifact="jcl-over-slf4j"/>
+diff --git a/build/pom.xml b/build/pom.xml
+index 2928f16..0cb1306 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -874,12 +874,10 @@
+ <artifactId>jboss-as-jaxrs</artifactId>
+ </dependency>
+
+- <!--
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-jdr</artifactId>
+ </dependency>
+- -->
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+@@ -968,12 +966,10 @@
+ <artifactId>jboss-as-security</artifactId>
+ </dependency>
+
+- <!--
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-sos</artifactId>
+ </dependency>
+- -->
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+@@ -1655,12 +1651,10 @@
+ <artifactId>picketbox-infinispan</artifactId>
+ </dependency>
+
+- <!--
+ <dependency>
+ <groupId>org.python</groupId>
+ <artifactId>jython-standalone</artifactId>
+ </dependency>
+- -->
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+diff --git a/pom.xml b/pom.xml
+index aaef12a..f05832e 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -5963,9 +5963,7 @@
+ -->
+ <module>jaxr</module>
+ <module>jaxrs</module>
+- <!--
+ <module>jdr</module>
+- -->
+ <module>jpa</module>
+ <module>jsr77</module>
+ <module>logging</module>
+--
+1.7.10.4
+
diff --git a/0024-Make-AS7-work-with-jython-2.2.1.patch b/0024-Make-AS7-work-with-jython-2.2.1.patch
new file mode 100644
index 0000000..a6f1947
--- /dev/null
+++ b/0024-Make-AS7-work-with-jython-2.2.1.patch
@@ -0,0 +1,37 @@
+From 0ea25332cc07ae5bd27401ad87b68221e4be00ca 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 24/25] Make AS7 work with jython 2.2.1
+
+---
+ jdr/jboss-as-jdr/src/main/java/org/jboss/as/jdr/SoSReport.java | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/jdr/jboss-as-jdr/src/main/java/org/jboss/as/jdr/SoSReport.java b/jdr/jboss-as-jdr/src/main/java/org/jboss/as/jdr/SoSReport.java
+index d5981da..0059b4e 100644
+--- a/jdr/jboss-as-jdr/src/main/java/org/jboss/as/jdr/SoSReport.java
++++ b/jdr/jboss-as-jdr/src/main/java/org/jboss/as/jdr/SoSReport.java
+@@ -32,6 +32,7 @@ import org.jboss.as.controller.client.ModelControllerClient;
+
+ import org.python.core.adapter.ClassicPyObjectAdapter;
+ import org.python.core.PyObject;
++import org.python.core.PyObject.ConversionException;
+ import org.python.core.PyString;
+ import org.python.util.PythonInterpreter;
+
+@@ -141,7 +142,11 @@ public class SoSReport {
+ * @return the full path to the report archive
+ */
+ public String execute() {
+- return sosreport.invoke("execute").asString();
++ try {
++ return sosreport.invoke("execute").asString(0);
++ } catch (ConversionException e) {
++ return "";
++ }
+ }
+
+ /**
+--
+1.7.10.4
+
diff --git a/0025-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch b/0025-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
new file mode 100644
index 0000000..ba0f1a4
--- /dev/null
+++ b/0025-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
@@ -0,0 +1,219 @@
+From 5ce83ed3fa197ef2b35fbad9281b02c8dbe24f69 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 25/25] Remove javax.jws.api. This is part of the JDK.
+
+---
+ build/build.xml | 6 ----
+ build/pom.xml | 7 -----
+ .../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/main/module.xml | 1 -
+ .../org/jboss/as/webservices/main/module.xml | 1 -
+ .../webservices/server/integration/main/module.xml | 1 -
+ .../modules/org/jboss/metadata/main/module.xml | 1 -
+ .../modules/org/jboss/ws/common/main/module.xml | 1 -
+ .../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(-)
+ 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
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -388,12 +388,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
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -318,13 +318,6 @@
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+
+- <!--
+- <dependency>
+- <groupId>javax.jws</groupId>
+- <artifactId>jsr181-api</artifactId>
+- </dependency>
+- -->
+-
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+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
++++ b/build/src/main/resources/modules/javaee/api/main/module.xml
+@@ -36,7 +36,6 @@
+ <module name="javax.inject.api" export="true"/>
+ <module name="javax.interceptor.api" export="true"/>
+ <module name="javax.jms.api" export="true"/>
+- <module name="javax.jws.api" export="true"/>
+ <module name="javax.mail.api" export="true"/>
+ <module name="javax.management.j2ee.api" export="true"/>
+ <module name="javax.persistence.api" export="true"/>
+diff --git a/build/src/main/resources/modules/javax/api/main/module.xml b/build/src/main/resources/modules/javax/api/main/module.xml
+index 3206521..a675b7a 100644
+--- a/build/src/main/resources/modules/javax/api/main/module.xml
++++ b/build/src/main/resources/modules/javax/api/main/module.xml
+@@ -38,6 +38,7 @@
+ <path name="javax/imageio/plugins/jpeg"/>
+ <path name="javax/imageio/spi"/>
+ <path name="javax/imageio/stream"/>
++ <path name="javax/jws"/>
+ <path name="javax/lang/model"/>
+ <path name="javax/lang/model/element"/>
+ <path name="javax/lang/model/type"/>
+diff --git a/build/src/main/resources/modules/javax/jws/api/main/module.xml b/build/src/main/resources/modules/javax/jws/api/main/module.xml
+deleted file mode 100644
+index 3332464..0000000
+--- a/build/src/main/resources/modules/javax/jws/api/main/module.xml
++++ /dev/null
+@@ -1,29 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-
+-<!--
+- ~ JBoss, Home of Professional Open Source.
+- ~ Copyright 2010, Red Hat, Inc., and individual contributors
+- ~ as indicated by the @author tags. See the copyright.txt file in the
+- ~ distribution for a full listing of individual contributors.
+- ~
+- ~ This is free software; you can redistribute it and/or modify it
+- ~ under the terms of the GNU Lesser General Public License as
+- ~ published by the Free Software Foundation; either version 2.1 of
+- ~ the License, or (at your option) any later version.
+- ~
+- ~ This software is distributed in the hope that it will be useful,
+- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- ~ Lesser General Public License for more details.
+- ~
+- ~ You should have received a copy of the GNU Lesser General Public
+- ~ License along with this software; if not, write to the Free
+- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+- -->
+-
+-<module xmlns="urn:jboss:module:1.1" name="javax.jws.api">
+- <resources>
+- <!-- Insert resources here -->
+- </resources>
+-</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 24cce6e..91e8fec 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 @@
+ <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/jboss/as/webservices/main/module.xml b/build/src/main/resources/modules/org/jboss/as/webservices/main/module.xml
+index c8b2bca..1d7d8fe 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 @@
+ <module name="javax.annotation.api"/>
+ <module name="javax.api"/>
+ <module name="javax.ejb.api"/>
+- <module name="javax.jws.api"/>
+ <module name="javax.servlet.api"/>
+ <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
+--- 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 @@
+
+ <dependencies>
+ <module name="javax.api" export="true"/>
+- <module name="javax.jws.api" export="true"/>
+ <module name="javax.wsdl4j.api" export="true"/>
+ <module name="javax.xml.ws.api" export="true"/>
+ <module name="com.sun.xml.bind" services="export" export="true"/>
+diff --git a/build/src/main/resources/modules/org/jboss/metadata/main/module.xml b/build/src/main/resources/modules/org/jboss/metadata/main/module.xml
+index 4d41ac8..6b0f69e 100644
+--- a/build/src/main/resources/modules/org/jboss/metadata/main/module.xml
++++ b/build/src/main/resources/modules/org/jboss/metadata/main/module.xml
+@@ -36,7 +36,6 @@
+ <module name="javax.api"/>
+ <module name="javax.ejb.api"/>
+ <module name="javax.interceptor.api"/>
+- <module name="javax.jws.api"/>
+ <module name="javax.persistence.api"/>
+ <module name="javax.servlet.api"/>
+ <module name="javax.servlet.jsp.api"/>
+diff --git a/build/src/main/resources/modules/org/jboss/ws/common/main/module.xml b/build/src/main/resources/modules/org/jboss/ws/common/main/module.xml
+index 3295568..5f2673b 100644
+--- a/build/src/main/resources/modules/org/jboss/ws/common/main/module.xml
++++ b/build/src/main/resources/modules/org/jboss/ws/common/main/module.xml
+@@ -37,7 +37,6 @@
+ <module name="javax.annotation.api"/>
+ <module name="javax.xml.stream.api"/>
+ <module name="javax.ejb.api"/>
+- <module name="javax.jws.api"/>
+ <module name="javax.servlet.api"/>
+ <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
+--- 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 @@
+ <dependencies>
+ <module name="javax.api" />
+ <module name="javax.servlet.api" />
+- <module name="javax.jws.api" />
+ <module name="javax.wsdl4j.api" />
+ <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
+--- 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 @@
+ <module name="com.sun.xml.fastinfoset" optional="true"/>
+ <module name="javax.api" />
+ <module name="javax.servlet.api" />
+- <module name="javax.jws.api" />
+ <module name="javax.mail.api" />
+ <module name="javax.wsdl4j.api" />
+ <module name="javax.xml.bind.api" />
+diff --git a/build/src/main/resources/modules/org/jboss/xts/main/module.xml b/build/src/main/resources/modules/org/jboss/xts/main/module.xml
+index 114e769..23cf11d 100644
+--- a/build/src/main/resources/modules/org/jboss/xts/main/module.xml
++++ b/build/src/main/resources/modules/org/jboss/xts/main/module.xml
+@@ -41,11 +41,6 @@
+ <module name="javax.xml.stream.api"/>
+ <!-- this is needed to get javax.xml.namespace.QName but it would be better if it were exposed on its own -->
+ <module name="javax.api"/>
+- <!-- this is needed because our endpoints are not in a normal deployment and we need to be able
+- to resolve the javax.jws.WebService annotation attached to them. presumably an endpoint
+- found in a deployment gets this package auto-added to its module loader
+- -->
+- <module name="javax.jws.api"/>
+ <!-- this is needed to ensure @Resource annotations on the JaxWS endpoint classes are in the
+ classloader scope-->
+ <module name="javax.annotation.api"/>
+--
+1.7.10.4
+
diff --git a/jboss-as.spec b/jboss-as.spec
index 905b217..934be5c 100644
--- a/jboss-as.spec
+++ b/jboss-as.spec
@@ -12,10 +12,10 @@
%global jbuid 185
# Enabled modules:
-%global modules cli cmp connector controller-client controller deployment-repository deployment-scanner domain-management ee ejb3 embedded host-controller jaxr jaxrs jmx jsr77 logging management-client-content mail modcluster naming network platform-mbean pojo process-controller protocol remoting sar security server threads transactions web weld
+%global modules cli cmp configadmin connector controller-client controller deployment-repository deployment-scanner domain-management ee ejb3 embedded host-controller jaxr jaxrs jmx jsr77 logging management-client-content mail modcluster naming network platform-mbean pojo process-controller protocol remoting sar security server threads transactions web weld
# Additional modules enabled, but not listed above because of different structure:
-# arquillian domain-http clustering jpa osgi
+# arquillian domain-http clustering jpa osgi jdr webservices
Name: jboss-as
Version: 7.1.1
@@ -37,76 +37,35 @@ 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-Build-additional-modules.patch
-Patch4: 0005-Adding-javax.transaction-to-the-minimal-build.patch
-Patch5: 0006-adding-javax.validation-to-build.xml.patch
-Patch6: 0007-adding-org.jboss.metadata-to-minimal-build.patch
-Patch7: 0008-adding-org.jboss.ejb3-module-to-minimal-build.patch
-Patch8: 0009-adding-org.jboss.as.logging.patch
-Patch9: 0010-adding-org.hibernate.validator.patch
-Patch10: 0011-adding-org.jboss.remote-naming-to-minimal-build.patch
-Patch11: 0012-Enable-org.jboss.as.transactions-module.patch
-Patch12: 0013-Removing-use-of-HornetqJournalEnvironmentBean-in-Arj.patch
-Patch13: 0014-adding-org.jboss.jboss-transaction-spi-to-minimal-bu.patch
-Patch14: 0015-adding-jta-modules-to-minimal-build.patch
-Patch15: 0016-adding-org.omg.api-to-minimal-build.patch
-Patch16: 0017-Enable-org.jboss.as.security-module.patch
-Patch17: 0018-Enable-part-of-org.jboss.as.clustering-module-infini.patch
-Patch18: 0019-Add-jgroups-module.patch
-Patch19: 0020-Add-infinispan-modules.patch
-Patch20: 0021-Added-jboss-jacc-api-module.patch
-Patch21: 0022-Added-javax.servlet.api-module.patch
-Patch22: 0023-Added-org.jboss.security.negotiation-module.patch
-Patch23: 0024-Added-org.picketbox-module.patch
-Patch24: 0025-Added-sun.jdk-module.patch
-Patch25: 0026-Added-jboss-as-connector-AS7-module.patch
-Patch26: 0027-Added-jboss-as-web-jboss-as-clustering-api-jboss-as-.patch
-Patch27: 0028-Added-net.jcip-org.jboss.ironjacamar-javax.resource..patch
-Patch28: 0029-Make-some-modules-optional.patch
-Patch29: 0030-Added-jboss-as-ejb3-jboss-as-weld-jboss-as-jpa-modul.patch
-Patch30: 0031-Added-additional-modules-required-on-runtime.patch
-Patch31: 0032-Enabled-rest-of-clustering-submodules.patch
-Patch32: 0033-Fixed-remoting-jmx-gid-reverting-rmi-changes-adding-.patch
-Patch33: 0034-Added-standalone-web.xml-example-configuration.-Use-.patch
-Patch34: 0035-Add-systemd-files-re-arrange-directory-with-init-scr.patch
-Patch35: 0036-Added-jboss-as-cli-module.patch
-Patch36: 0037-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
-Patch37: 0038-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
-Patch38: 0039-Added-domain-add-user-module.patch
-Patch39: 0040-Remove-activation-module.patch
-Patch40: 0041-Use-properties-in-add-user-AS7-module.patch
-Patch41: 0042-added-support-for-overriding-the-user-and-roles-prop.patch
-Patch42: 0043-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
-Patch43: 0044-Removing-some-banned-deps-as-in-Fedora-those-are-jus.patch
-Patch44: 0045-Add-org.jboss.as.config-assembly-module.patch
-Patch45: 0046-Added-org.jboss.as.cmp-module.patch
-Patch46: 0047-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
-Patch47: 0048-Added-org.jboss.as.mail-module.patch
-Patch48: 0049-Added-org.jboss.as.jaxrs-module.patch
-Patch49: 0050-Added-org.jboss.as.pojo-module.patch
-Patch50: 0051-Loose-banned-deps-on-javax.xml.stream-stax-api.patch
-Patch51: 0052-Remove-jbossweb-native-dependency.-We-ll-have-unpack.patch
-Patch52: 0053-Add-dependencies-to-minimal-for-missing-modules-to-r.patch
-Patch53: 0054-Added-org.jboss.as.sar-module.patch
-Patch54: 0055-Added-org.jboss.as.host-controller-module.patch
-Patch55: 0056-Added-org.jboss.as.webservices.server.integration-an.patch
-Patch56: 0057-Enable-jboss-as-ejb-client-bom.patch
-Patch57: 0058-Enabled-org.jboss.spec.javax.ws.rs-module.patch
-Patch58: 0059-Added-org.jboss.as.jaxr-module.patch
-Patch59: 0060-Added-org.jboss.as.messaging-module.patch
-Patch60: 0061-Runtime-dependencies.patch
-Patch61: 0062-Added-org.jboss.as.modcluster-module.patch
-Patch62: 0063-Enable-jboss-as-jms-client-bom.patch
-Patch63: 0064-Added-org.jboss.as.jsr77-module.patch
-Patch64: 0065-Added-org.jboss.as.arquillian-module.patch
-Patch65: 0066-Added-org.jboss.as.osgi-module.patch
-Patch66: 0067-Disable-for-now-ARQ-testng-integration.patch
-Patch67: 0068-Added-org.jboss.as.configadmin-module.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
BuildArch: noarch
# Please keep alphabetically
BuildRequires: ant-apache-bsf
+BuildRequires: apache-commons-cli
+BuildRequires: apache-commons-codec
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-configuration
BuildRequires: apache-commons-lang
@@ -121,16 +80,24 @@ BuildRequires: bean-validation-api
BuildRequires: bsf
BuildRequires: cal10n
BuildRequires: cdi-api
+BuildRequires: cssparser
BuildRequires: dom4j
# TODO: ecj dependency tree is big and ugly...
BuildRequires: ecj
BuildRequires: felix-configadmin
+BuildRequires: felix-osgi-core
+BuildRequires: felix-osgi-compendium
BuildRequires: guava
BuildRequires: h2
+BuildRequires: hibernate3
+BuildRequires: hibernate-commons-annotations
BuildRequires: hibernate-jpa-2.0-api
BuildRequires: hibernate-validator
BuildRequires: hornetq
+BuildRequires: httpcomponents-client
+BuildRequires: httpcomponents-core
BuildRequires: git
+BuildRequires: glassfish-jaxb
BuildRequires: infinispan
BuildRequires: ironjacamar
BuildRequires: jandex
@@ -139,7 +106,14 @@ BuildRequires: javacc-maven-plugin
BuildRequires: javamail
BuildRequires: javassist
BuildRequires: jgroups
+BuildRequires: jbosgi-deployment
+BuildRequires: jbosgi-framework
+BuildRequires: jbosgi-metadata
BuildRequires: jbosgi-repository
+BuildRequires: jbosgi-resolver1
+BuildRequires: jbosgi-spi
+BuildRequires: jbosgi-vfs
+BuildRequires: jbosgi-parent
BuildRequires: jboss-annotations-1.1-api
BuildRequires: jboss-classfilewriter
BuildRequires: jboss-common-core
@@ -158,12 +132,14 @@ BuildRequires: jboss-j2eemgmt-1.1-api
BuildRequires: jboss-jacc-1.4-api
BuildRequires: jboss-jad-1.2-api
BuildRequires: jboss-jaxb-2.2-api
+BuildRequires: jboss-jaxb-intros
BuildRequires: jboss-jaxr-1.0-api
BuildRequires: jboss-jaxrpc-1.1-api
BuildRequires: jboss-jaxrs-1.1-api
+BuildRequires: jboss-jaxws-2.2-api
BuildRequires: jboss-jaspi-1.0-api
BuildRequires: jboss-jms-1.1-api
-BuildRequires: jboss-jts
+BuildRequires: jboss-jts >= 4.16.2-4
BuildRequires: jboss-jsf-2.1-api
BuildRequires: jboss-jsp-2.2-api
BuildRequires: jboss-jstl-1.2-api
@@ -193,24 +169,33 @@ BuildRequires: jboss-web
BuildRequires: jboss-web-native
BuildRequires: jboss-vfs
BuildRequires: jbossws-api
+BuildRequires: jbossws-common >= 2.0.4-3
+BuildRequires: jbossws-cxf
+BuildRequires: jbossws-spi >= 2.0.3-2
BuildRequires: jcip-annotations
BuildRequires: jline
BuildRequires: jul-to-slf4j-stub
BuildRequires: joda-time
BuildRequires: jpackage-utils
+BuildRequires: jython >= 2.2.1-9
BuildRequires: maven
BuildRequires: maven-jar-plugin
BuildRequires: maven-checkstyle-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-dependency-plugin
+BuildRequires: maven-help-plugin
+BuildRequires: maven-shade-plugin
+BuildRequires: xml-maven-plugin
BuildRequires: mojarra
BuildRequires: mod_cluster-java >= 1.2.1-2
+BuildRequires: neethi
BuildRequires: netty
BuildRequires: picketbox
BuildRequires: picketbox-commons
BuildRequires: resteasy >= 2.3.2-7
BuildRequires: rhq-plugin-annotations
+BuildRequires: scannotation
BuildRequires: shrinkwrap
BuildRequires: shrinkwrap-resolver
BuildRequires: slf4j
@@ -220,11 +205,15 @@ BuildRequires: systemd-units
BuildRequires: weld-api
BuildRequires: weld-core
BuildRequires: weld-parent
+BuildRequires: wsdl4j >= 1.6.2-5
+BuildRequires: wss4j
BuildRequires: xalan-j2
BuildRequires: xerces-j2
BuildRequires: xnio
Requires: atinject
+Requires: apache-commons-cli
+Requires: apache-commons-codec
Requires: apache-commons-collections
Requires: apache-commons-configuration
Requires: apache-commons-lang
@@ -237,22 +226,36 @@ Requires: arquillian-osgi
Requires: bean-validation-api
Requires: cal10n
Requires: cdi-api
+Requires: cssparser
Requires: dom4j
# TODO: ecj dependency tree is big and ugly...
Requires: ecj
Requires: felix-configadmin
+Requires: felix-osgi-core
+Requires: felix-osgi-compendium
Requires: guava
+Requires: glassfish-jaxb
Requires: h2
+Requires: hibernate3
+Requires: hibernate-commons-annotations
Requires: hibernate-jpa-2.0-api
Requires: hibernate-validator
Requires: hornetq
+Requires: httpcomponents-client
+Requires: httpcomponents-core
Requires: infinispan
Requires: ironjacamar
Requires: jandex
Requires: java >= 1:1.7.0
Requires: javamail
Requires: javassist
+Requires: jbosgi-deployment
+Requires: jbosgi-framework
+Requires: jbosgi-metadata
Requires: jbosgi-repository
+Requires: jbosgi-resolver1
+Requires: jbosgi-spi
+Requires: jbosgi-vfs
Requires: jboss-annotations-1.1-api
Requires: jboss-classfilewriter
Requires: jboss-common-core
@@ -271,15 +274,17 @@ Requires: jboss-j2eemgmt-1.1-api
Requires: jboss-jacc-1.4-api
Requires: jboss-jad-1.2-api
Requires: jboss-jaxb-2.2-api
+Requires: jboss-jaxb-intros
Requires: jboss-jaxr-1.0-api
Requires: jboss-jaxrpc-1.1-api
Requires: jboss-jaxrs-1.1-api
+Requires: jboss-jaxws-2.2-api
Requires: jboss-jaspi-1.0-api
Requires: jboss-jms-1.1-api
Requires: jboss-jsf-2.1-api
Requires: jboss-jsp-2.2-api
Requires: jboss-jstl-1.2-api
-Requires: jboss-jts
+Requires: jboss-jts >= 4.16.2-4
Requires: jboss-logging
Requires: jboss-logging-tools
Requires: jboss-logmanager
@@ -304,20 +309,26 @@ Requires: jboss-web
Requires: jboss-web-native
Requires: jboss-vfs
Requires: jbossws-api
+Requires: jbossws-common >= 2.0.4-3
+Requires: jbossws-cxf
+Requires: jbossws-spi >= 2.0.3-2
Requires: jcip-annotations
Requires: jgroups
Requires: jline
Requires: jul-to-slf4j-stub
Requires: joda-time
Requires: jpackage-utils
+Requires: jython >= 2.2.1-9
Requires: mojarra
Requires: mod_cluster-java >= 1.2.1-2
+Requires: neethi
Requires: netty
Requires: openssl
Requires: picketbox
Requires: picketbox-commons
Requires: resteasy >= 2.3.2-7
Requires: rhq-plugin-annotations
+Requires: scannotation
Requires: shrinkwrap
Requires: shrinkwrap-resolver
Requires: slf4j
@@ -325,6 +336,8 @@ Requires: slf4j-jboss-logmanager
Requires: staxmapper
Requires: weld-api
Requires: weld-core
+Requires: wsdl4j >= 1.6.2-5
+Requires: wss4j
Requires: xalan-j2
Requires: xerces-j2
Requires: xnio
@@ -360,7 +373,7 @@ git am %{patches}
export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=384m"
# We don't have packaged all test dependencies (jboss-test for example)
-mvn-rpmbuild -Dmaven.test.skip=true -Dminimalistic -e install javadoc:aggregate
+mvn-rpmbuild -Dmaven.test.skip=true -e install javadoc:aggregate
%install
@@ -393,13 +406,14 @@ for m in %{modules} build-config ee-deployment; do
done
# Definition of submodules
-multimodules="arquillian domain-http clustering jpa osgi"
+multimodules="arquillian domain-http clustering jpa osgi webservices"
# If a submodule contains hyphen in the name, just skip it, e.g. domain-http => domainhttp
modules_arquillian="common container-managed container-remote protocol-jmx testenricher-msc"
modules_clustering="api common impl jgroups infinispan registry service web-spi web-infinispan ejb3-infinispan"
modules_jpa="util spi"
modules_domainhttp="interface error-context"
modules_osgi="service configadmin"
+modules_webservices="server-integration tests-integration"
for m in ${multimodules}; do
# POM
@@ -428,12 +442,31 @@ cp -a jpa/core/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-jpa.po
# DEPMAP
%add_maven_depmap JPP.%{name}-%{name}-jpa.pom %{name}/%{name}-jpa.jar
+for m in jdr sos; do
+ # JAR
+ cp -a jdr/jboss-as-${m}/target/jboss-as-${m}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-${m}.jar
+ # POM
+ cp -a jdr/jboss-as-${m}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
+ # DEPMAP
+ %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar
+done
+
+# POMs
+cp -a jpa/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-jpa-parent.pom
+cp -a jdr/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-jdr-parent.pom
+cp -a spec-api/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-spec-api.pom
+
+# Depmaps
+%add_maven_depmap JPP.%{name}-%{name}-jpa-parent.pom
+%add_maven_depmap JPP.%{name}-%{name}-jdr-parent.pom
+%add_maven_depmap JPP.%{name}-%{name}-spec-api.pom
+
# Exceptions END
# Parent POM
cp -a pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-parent.pom
-# Depmap fo parent POM
+# Depmap for parent POM
%add_maven_depmap JPP.%{name}-%{name}-parent.pom
# Apidocs
@@ -534,6 +567,10 @@ pushd $RPM_BUILD_ROOT%{homedir}
# And some other expcetions...
ln -s %{_javadir}/jboss-as/jboss-as-jpa.jar org/jboss/as/jpa/main/jboss-as-jpa-%{namedversion}.jar
+ ln -s %{_javadir}/jboss-as/jboss-as-jdr.jar org/jboss/as/jdr/main/jboss-as-jdr-%{namedversion}.jar
+ ln -s %{_javadir}/jboss-as/jboss-as-sos.jar org/jboss/as/jdr/main/jboss-as-sos-%{namedversion}.jar
+ ln -s %{_javadir}/jboss-as/jboss-as-osgi-service.jar org/jboss/as/osgi/main/jboss-as-osgi-service-%{namedversion}.jar
+ ln -s %{_javadir}/jboss-as/jboss-as-webservices-server-integration.jar org/jboss/as/webservices/main/jboss-as-webservices-server-integration-%{namedversion}.jar
# Remove native libs that are shipped with the source distribution...
rm -rf org/hornetq/main/lib/*
@@ -544,10 +581,12 @@ pushd $RPM_BUILD_ROOT%{homedir}
# Please keep alphabetic by jar name
- for m in collections configuration lang logging; do
+ for m in codec collections configuration lang logging; do
ln -s $(build-classpath apache-commons-${m}) org/apache/commons/${m}/main/commons-${m}.jar
done
+ ln -s $(build-classpath apache-commons-cli) org/apache/commons/cli/main/apache-commons-cli.jar
+
ln -s $(build-classpath apache-juddi/juddi-client) org/apache/juddi/juddi-client/main/juddi-client.jar
ln -s $(build-classpath apache-juddi/uddi-ws) org/apache/juddi/uddi-ws/main/uddi-ws.jar
ln -s $(build-classpath apache-scout) org/apache/juddi/scout/main/scout.jar
@@ -556,11 +595,22 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath cdi-api) javax/enterprise/api/main/cdi-api.jar
ln -s $(build-classpath ecj) org/jboss/as/web/main/ecj.jar
ln -s $(build-classpath guava) com/google/guava/main/guava.jar
+ ln -s $(build-classpath glassfish-jaxb/jaxb-impl) com/sun/xml/bind/main/jaxb-impl.jar
+ ln -s $(build-classpath glassfish-jaxb/jaxb-xjc) com/sun/xml/bind/main/jaxb-xjc.jar
# TODO this is an UGLY hack, think about removing it at some point!
ln -s $(build-classpath bean-validation-api) javax/validation/api/main/geronimo-validation.jar
+ ln -s $(build-classpath h2) com/h2database/h2/main/h2.jar
ln -s $(build-classpath hibernate-validator) org/hibernate/validator/main/hibernate-validator.jar
ln -s $(build-classpath hibernate-jpa-2.0-api) javax/persistence/api/main/hibernate-jpa-2.0-api.jar
+ ln -s $(build-classpath hornetq/hornetq-core) org/hornetq/main/hornetq-core.jar
+ ln -s $(build-classpath hornetq/hornetq-jms) org/hornetq/main/hornetq-jms.jar
+ ln -s $(build-classpath hornetq/hornetq-ra) org/hornetq/ra/main/hornetq-ra.jar
+
+ ln -s $(build-classpath httpcomponents/httpclient) org/apache/httpcomponents/main/httpclient.jar
+ ln -s $(build-classpath httpcomponents/httpcore) org/apache/httpcomponents/main/httpcore.jar
+ ln -s $(build-classpath httpcomponents/httpmime) org/apache/httpcomponents/main/httpmime.jar
+
ln -s $(build-classpath infinispan/infinispan-cachestore-jdbc) org/infinispan/cachestore/jdbc/main/infinispan-cachestore-jdbc.jar
ln -s $(build-classpath infinispan/infinispan-cachestore-remote) org/infinispan/cachestore/remote/main/infinispan-cachestore-remote.jar
ln -s $(build-classpath infinispan/infinispan-client-hotrod) org/infinispan/client/hotrod/main/infinispan-client-hotrod.jar
@@ -579,6 +629,20 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath javassist) org/javassist/main/javassist.jar
ln -s $(build-classpath jcip-annotations) net/jcip/main/jcip-annotations.jar
ln -s $(build-classpath jandex) org/jboss/jandex/main/jandex.jar
+ ln -s $(build-classpath jboss-jaxrs-1.1-api/jaxrs-api) javax/ws/rs/api/main/jaxrs-api.jar
+
+ ln -s $(build-classpath jbosgi-deployment) org/jboss/osgi/framework/main/jbosgi-deployment.jar
+ ln -s $(build-classpath jbosgi-framework-core) org/jboss/osgi/framework/main/jbosgi-framework-core.jar
+ ln -s $(build-classpath jbosgi-metadata) org/jboss/osgi/metadata/main/jbosgi-metadata.jar
+ ln -s $(build-classpath jbosgi-repository/jbosgi-repository-api) org/jboss/osgi/repository/main/jbosgi-repository-api.jar
+ ln -s $(build-classpath jbosgi-repository/jbosgi-repository-core) org/jboss/osgi/repository/main/jbosgi-repository-core.jar
+ ln -s $(build-classpath jbosgi-resolver1/jbosgi-resolver1-spi) org/jboss/osgi/framework/main/jbosgi-resolver1-spi.jar
+ ln -s $(build-classpath jbosgi-resolver1/jbosgi-resolver1-api) org/jboss/osgi/framework/main/jbosgi-resolver1-api.jar
+ ln -s $(build-classpath jbosgi-resolver1/jbosgi-resolver1-felix) org/jboss/osgi/framework/main/jbosgi-resolver1-felix.jar
+ ln -s $(build-classpath jbosgi-spi) org/jboss/osgi/spi/main/jbosgi-spi.jar
+ ln -s $(build-classpath jbosgi-vfs-vfs) org/jboss/osgi/vfs/main/jbosgi-vfs-vfs.jar
+ ln -s $(build-classpath jbosgi-vfs-vfs30) org/jboss/osgi/vfs/main/jbosgi-vfs-vfs30.jar
+
ln -s $(build-classpath jboss-annotations-1.1-api) javax/annotation/api/main/jboss-annotations-1.1-api.jar
ln -s $(build-classpath jboss-classfilewriter) org/jboss/classfilewriter/main/jboss-classfilewriter.jar
ln -s $(build-classpath jboss-common-core) org/jboss/common-core/main/jboss-common-core.jar
@@ -594,12 +658,14 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath jboss-interceptor-spi) org/jboss/interceptor/spi/main/jboss-interceptor-spi.jar
ln -s $(build-classpath jboss-interceptors-1.1-api) javax/interceptor/api/main/jboss-interceptors-1.1-api.jar
ln -s $(build-classpath jboss-invocation) org/jboss/invocation/main/jboss-invocation.jar
- ln -s $(build-classpath jboss-jboss-j2eemgmt-1.1-api) javax/management/j2ee/api/main/jboss-j2eemgmt-1.1-api.jar
+ ln -s $(build-classpath jboss-j2eemgmt-1.1-api) javax/management/j2ee/api/main/jboss-j2eemgmt-1.1-api.jar
ln -s $(build-classpath jboss-jacc-1.4-api) javax/security/jacc/api/main/jboss-jacc-1.4-api.jar
ln -s $(build-classpath jboss-jad-1.2-api) javax/enterprise/deploy/api/main/jboss-jad-1.2-api.jar
ln -s $(build-classpath jboss-jaxb-2.2-api) javax/xml/bind/api/main/jboss-jaxb-2.2-api.jar
+ ln -s $(build-classpath jboss-jaxb-intros) org/jboss/jaxbintros/main/jboss-jaxb-intros.jar
ln -s $(build-classpath jboss-jaxrpc-1.1-api) javax/xml/rpc/api/main/jboss-jaxrpc-1.1-api.jar
ln -s $(build-classpath jboss-jaxrs-1.1-api) javax/ws/rs/api/main/jboss-jaxrs-1.1-api.jar
+ ln -s $(build-classpath jboss-jaxws-2.2-api) javax/xml/ws/api/main/jboss-jaxws-2.2-api.jar
ln -s $(build-classpath jboss-jaspi-1.0-api) javax/security/auth/message/api/main/jboss-jaspi-1.0-api.jar
ln -s $(build-classpath jboss-jms-1.1-api) javax/jms/api/main/jboss-jms-1.1-api.jar
ln -s $(build-classpath jboss-jsf-2.1-api) javax/faces/api/main/jboss-jsf-2.1-api.jar
@@ -638,11 +704,16 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath jboss-transaction-spi) org/jboss/jboss-transaction-spi/main/jboss-transaction-spi.jar
ln -s $(build-classpath jboss-vfs) org/jboss/vfs/main/jboss-vfs.jar
ln -s $(build-classpath jboss-web) org/jboss/as/web/main/jboss-web.jar
+ ln -s $(build-classpath jbossws-api) org/jboss/ws/api/main/jbossws-api.jar
+ ln -s $(build-classpath jbossws-common) org/jboss/ws/common/main/jbossws-common.jar
+ ln -s $(build-classpath jbossws-spi) org/jboss/ws/spi/main/jbossws-spi.jar
+ ln -s $(build-classpath jbossws-cxf/jbossws-cxf-resources) org/jboss/as/webservices/main/jbossws-cxf-resources.jar
ln -s $(build-classpath jgroups) org/jgroups/main/jgroups.jar
ln -s $(build-classpath jline) jline/main/jline.jar
ln -s $(build-classpath jul-to-slf4j-stub) org/jboss/logging/jul-to-slf4j-stub/main/jul-to-slf4j-stub.jar
ln -s $(build-classpath joda-time) org/joda/time/main/joda-time.jar
ln -s $(build-classpath log4j) org/apache/log4j/main/log4j.jar
+ ln -s $(build-classpath jython) org/python/jython/standalone/main/jython.jar
ln -s $(build-classpath mojarra/jsf-impl) com/sun/jsf-impl/main/jsf-impl.jar
for m in container-catalina container-jbossweb container-spi core; do
@@ -650,6 +721,7 @@ pushd $RPM_BUILD_ROOT%{homedir}
done
ln -s $(build-classpath netty) org/jboss/netty/main/netty.jar
+ ln -s $(build-classpath felix/org.osgi.core) org/osgi/core/main/org.osgi.core.jar
ln -s $(build-classpath picketbox/picketbox) org/picketbox/main/picketbox.jar
ln -s $(build-classpath picketbox/infinispan) org/picketbox/main/infinispan.jar
ln -s $(build-classpath picketbox-commons) org/picketbox/main/picketbox-commons.jar
@@ -660,6 +732,15 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath resteasy/resteasy-${m}-jandex) org/jboss/resteasy/resteasy-${m}/main/resteasy-${m}-jandex.jar
done
+ # RestEasy exception
+ ln -s $(build-classpath resteasy/async-http-servlet-3.0) org/jboss/resteasy/resteasy-jaxrs/main/async-http-servlet-3.0.jar
+
+ ln -s $(build-classpath scannotation) org/scannotation/scannotation/main/scannotation.jar
+
+ ln -s $(build-classpath shrinkwrap/api) org/jboss/shrinkwrap/core/main/api.jar
+ ln -s $(build-classpath shrinkwrap/spi) org/jboss/shrinkwrap/core/main/spi.jar
+ 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/ext) org/slf4j/ext/main/ext.jar
ln -s $(build-classpath slf4j/jcl-over-slf4j) org/slf4j/jcl-over-slf4j/main/jcl-over-slf4j.jar
@@ -668,6 +749,7 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath weld-api/weld-api) org/jboss/weld/api/main/weld-api.jar
ln -s $(build-classpath weld-api/weld-spi) org/jboss/weld/spi/main/weld-spi.jar
ln -s $(build-classpath weld-core) org/jboss/weld/core/main/weld-core.jar
+ ln -s $(build-classpath wsdl4j) javax/wsdl4j/api/main/wsdl4j.jar
ln -s $(build-classpath xalan-j2) org/apache/xalan/main/xalan-j2.jar
ln -s $(build-classpath xalan-j2-serializer) org/apache/xalan/main/xalan-j2-serializer.jar
ln -s $(build-classpath xerces-j2) org/apache/xerces/main/xerces-j2.jar
@@ -702,14 +784,14 @@ else
fi
pushd %{homedir}/modules/org/hornetq/main/lib/linux-${arch} > /dev/null
- ln -s ${libdir}/libHornetQAIO.so.0 libHornetQAIO.so
+ ln -sf ${libdir}/libHornetQAIO.so.0 libHornetQAIO.so
popd > /dev/null
pushd %{homedir}/modules/org/jboss/as/web/main/lib/linux-${arch} > /dev/null
- ln -s ${libdir}/libjbnative-1.so.0 libtcnative-1.so
- ln -s ${libdir}/libapr-1.so.0 libapr-1.so
- ln -s ${libdir}/libcrypto.so libcrypto.so
- ln -s ${libdir}/libssl.so libssl.so
+ ln -sf ${libdir}/libjbnative-1.so.0 libtcnative-1.so
+ ln -sf ${libdir}/libapr-1.so.0 libapr-1.so
+ ln -sf ${libdir}/libcrypto.so libcrypto.so
+ ln -sf ${libdir}/libssl.so libssl.so
popd > /dev/null
%preun
@@ -762,7 +844,7 @@ rm -rf %{homedir}/modules/org/hornetq/main/lib/linux-${arch}/*
%doc %{homedir}/LICENSE.txt
%changelog
-* Mon Jun 04 2012 Marek Goldmann <mgoldman at redhat.com> 7.1.1-4
+* Wed Jul 04 2012 Marek Goldmann <mgoldman at redhat.com> 7.1.1-4
- jboss-as-cp script is missing argument placeholder for c optarg, RHBZ#827571
- Create a startup script when creating a new user instance (jboss-as-cp), RHBZ#827588
- The user instance create script (jboss-as-cp) should allow a port offset to be specified, RHBZ#827589
@@ -771,6 +853,8 @@ rm -rf %{homedir}/modules/org/hornetq/main/lib/linux-${arch}/*
- Added org.jboss.as.arquillian module
- Added org.jboss.as.osgi module
- Added org.jboss.as.configadmin module
+- Added org.jboss.as.spec-api module
+- Add ExampleDS based on H2 database, RHBZ#81252
* Fri May 11 2012 Marek Goldmann <mgoldman at redhat.com> 7.1.1-3
- Changed the way we apply patches at build time
More information about the scm-commits
mailing list