[jboss-as] Upstream release 7.1.1.Final Added jboss-as-cmp module
Marek Goldmann
goldmann at fedoraproject.org
Tue Apr 24 15:01:25 UTC 2012
commit 166f0dd581e11a10eb975f610a9ad9418b7e230b
Author: Marek Goldmann <mgoldman at redhat.com>
Date: Sat Apr 21 08:02:02 2012 +0200
Upstream release 7.1.1.Final
Added jboss-as-cmp module
.gitignore | 1 +
...-NOT-UPSTREAM-an-ugly-patch-to-remove-IIO.patch | 198 ++++++-----
...eckstyle.patch => 0002-Disable-checkstyle.patch | 18 +-
...itd-script.patch => 0003-Fix-initd-script.patch | 8 +-
...es.patch => 0004-Build-additional-modules.patch | 44 ++--
0004-Ugly-patch-nuff-said.patch | 28 --
...ng-javax.transaction-to-the-minimal-build.patch | 14 +-
0006-adding-javax.validation-to-build.xml.patch | 14 +-
...chemas-and-create-client-all-jar-on-norma.patch | 64 ----
...dding-org.jboss.metadata-to-minimal-build.patch | 18 +-
0008-Make-the-dependency-on-dom4j-optional.patch | 25 --
...ng-org.jboss.ejb3-module-to-minimal-build.patch | 18 +-
...patch => 0009-adding-org.jboss.as.logging.patch | 42 ++-
0010-adding-org.hibernate.validator.patch | 66 ++++
...-org.jboss.remote-naming-to-minimal-build.patch | 67 ++++
...2-Enable-org.jboss.as.transactions-module.patch | 24 +-
...gging-module-from-the-normal-profile-as-i.patch | 25 --
...e-of-HornetqJournalEnvironmentBean-in-Arj.patch | 10 +-
...jboss.jboss-transaction-spi-to-minimal-bu.patch | 68 ++++
...dependency-in-javax.xml.ws.api-optional-i.patch | 26 --
0015-adding-jta-modules-to-minimal-build.patch | 85 +++++
0015-adding-org.hibernate.validator.patch | 37 --
...-org.jboss.remote-naming-to-minimal-build.patch | 38 --
... 0016-adding-org.omg.api-to-minimal-build.patch | 24 +-
... 0017-Enable-org.jboss.as.security-module.patch | 24 +-
...-of-org.jboss.as.clustering-module-infini.patch | 32 +-
...s-module.patch => 0019-Add-jgroups-module.patch | 22 +-
...jboss.jboss-transaction-spi-to-minimal-bu.patch | 38 --
...ules.patch => 0020-Add-infinispan-modules.patch | 18 +-
0020-adding-jts-modules-to-minimal-build.patch | 46 ---
...patch => 0021-Added-jboss-jacc-api-module.patch | 18 +-
...ch => 0022-Added-javax.servlet.api-module.patch | 18 +-
...ded-org.jboss.security.negotiation-module.patch | 20 +-
....patch => 0024-Added-org.picketbox-module.patch | 20 +-
...module.patch => 0025-Added-sun.jdk-module.patch | 14 +-
... 0026-Added-jboss-as-connector-AS7-module.patch | 28 +-
...-as-web-jboss-as-clustering-api-jboss-as-.patch | 44 ++--
...cip-org.jboss.ironjacamar-javax.resource..patch | 120 +++----
....patch => 0029-Make-some-modules-optional.patch | 18 +-
...-as-ejb3-jboss-as-weld-jboss-as-jpa-modul.patch | 121 +++-----
...ed-additional-modules-required-on-runtime.patch | 68 ++--
...032-Enabled-rest-of-clustering-submodules.patch | 20 +-
...ing-jmx-gid-reverting-rmi-changes-adding-.patch | 62 +---
...alone-web.xml-example-configuration.-Use-.patch | 6 +-
...-files-re-arrange-directory-with-init-scr.patch | 190 ++++-------
...e.patch => 0036-Added-jboss-as-cli-module.patch | 54 +---
0037-Exludes-cleanup.patch | 25 --
...OME-when-jboss-cli.sh-is-executed-through.patch | 4 +-
...OSS_BASE_DIR-is-checked-in-standalone.sh-.patch | 10 +-
...atch => 0039-Added-domain-add-user-module.patch | 10 +-
...le.patch => 0040-Remove-activation-module.patch | 24 +-
...grade-to-Remoting-JMX-1.0.2-including-swi.patch | 96 ------
...041-Use-properties-in-add-user-AS7-module.patch | 208 ++++++------
...rt-for-overriding-the-user-and-roles-prop.patch | 359 ++++++++++++++++++++
...d-user.sh-mangles-permissions-of-mgmt-use.patch | 8 +-
0044-Fixed-systemd-service-file.patch | 34 --
...me-banned-deps-as-in-Fedora-those-are-jus.patch | 20 +-
0045-Add-org.jboss.as.config-assembly-module.patch | 32 ++
...tch => 0046-Added-org.jboss.as.cmp-module.patch | 82 +++---
...S7-4286-Fix-JavaCC-grammars-for-version-5.patch | 144 ++++++++
0047-Simplified-systemd-files.patch | 121 -------
...048-Added-org.jboss.as.configadmin-module.patch | 74 ++--
...s-from-systemd-service-we-don-t-need-dupl.patch | 121 -------
...-systemd-config-file-location-we-want-to-.patch | 30 --
jboss-as-cp.sh | 2 +-
jboss-as.spec | 129 ++++----
sources | 2 +-
67 files changed, 1695 insertions(+), 1803 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9dc6443..939e03a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/jboss-as-7.1.0.Final-CLEAN.tar.xz
+/jboss-as-7.1.1.Final-CLEAN.tar.xz
diff --git a/0009-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
similarity index 89%
rename from 0009-AS7-3724-DO-NOT-UPSTREAM-an-ugly-patch-to-remove-IIO.patch
rename to 0001-AS7-3724-DO-NOT-UPSTREAM-an-ugly-patch-to-remove-IIO.patch
index e120a2a..10d2cfd 100644
--- a/0009-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 41efa6ce071a08e7eab24d7df392c2b9637703f4 Mon Sep 17 00:00:00 2001
+From 927183315f53a5cfe590ace851888dcd280acbd9 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 09/15] AS7-3724: DO NOT UPSTREAM! an ugly patch to remove
+Subject: [PATCH 01/43] AS7-3724: DO NOT UPSTREAM! an ugly patch to remove
IIOP functionality
---
@@ -11,26 +11,26 @@ Subject: [PATCH 09/15] AS7-3724: DO NOT UPSTREAM! an ugly patch to remove
.../modules/org/jboss/jts/main/module.xml | 2 +-
.../resources/modules/org/omg/api/main/module.xml | 2 +-
ejb3/pom.xml | 9 +++
- .../ejb3/deployment/EjbDeploymentInformation.java | 15 +++--
+ .../ejb3/deployment/EjbDeploymentInformation.java | 14 ++++-
.../processors/DeploymentRepositoryProcessor.java | 4 +-
.../EjbDependencyDeploymentUnitProcessor.java | 3 +-
- .../org/jboss/as/ejb3/subsystem/EJB3Extension.java | 9 +--
- .../as/ejb3/subsystem/EJB3Subsystem12Parser.java | 66 ++++++++++++++++---
+ .../org/jboss/as/ejb3/subsystem/EJB3Extension.java | 6 +-
+ .../as/ejb3/subsystem/EJB3Subsystem12Parser.java | 66 ++++++++++++++++----
.../jboss/as/ejb3/subsystem/EJB3SubsystemAdd.java | 39 +++++++-----
.../ejb/ManagementEjbDeploymentInformation.java | 3 +-
pom.xml | 9 ++-
- transactions/pom.xml | 9 ++-
+ transactions/pom.xml | 10 ++-
.../txn/service/ArjunaRecoveryManagerService.java | 25 +++-----
- .../service/ArjunaTransactionManagerService.java | 21 +++---
+ .../service/ArjunaTransactionManagerService.java | 21 ++++---
.../jboss/as/txn/service/XATerminatorService.java | 3 +
- .../as/txn/subsystem/TransactionSubsystemAdd.java | 3 +-
- 19 files changed, 167 insertions(+), 79 deletions(-)
+ .../as/txn/subsystem/TransactionSubsystemAdd.java | 4 +-
+ 19 files changed, 168 insertions(+), 76 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 9f698f5..8e7dfd6 100644
+index 0a0ce06..4c56cf3 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -659,9 +659,11 @@
+@@ -665,9 +665,11 @@
<maven-resource group="org.infinispan" artifact="infinispan-client-hotrod" />
</module-def>
@@ -42,7 +42,7 @@ index 9f698f5..8e7dfd6 100644
<module-def name="org.javassist">
<maven-resource group="org.javassist" artifact="javassist"/>
-@@ -763,9 +765,11 @@
+@@ -777,9 +779,11 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-jsr77"/>
</module-def>
@@ -54,7 +54,7 @@ index 9f698f5..8e7dfd6 100644
<module-def name="org.jboss.as.jaxr">
<maven-resource group="org.jboss.as" artifact="jboss-as-jaxr"/>
-@@ -935,11 +939,11 @@
+@@ -949,11 +953,11 @@
</module-def>
<module-def name="org.jboss.jts">
@@ -69,10 +69,10 @@ index 9f698f5..8e7dfd6 100644
<module-def name="org.jboss.metadata">
diff --git a/build/pom.xml b/build/pom.xml
-index 681b2a6..df54020 100644
+index dfc91a9..5bc6527 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -273,10 +273,12 @@
+@@ -292,10 +292,12 @@
<artifactId>getopt</artifactId>
</dependency>
@@ -85,7 +85,7 @@ index 681b2a6..df54020 100644
<dependency>
<groupId>javax.activation</groupId>
-@@ -850,10 +852,12 @@
+@@ -879,10 +881,12 @@
<artifactId>jboss-as-host-controller</artifactId>
</dependency>
@@ -98,7 +98,7 @@ index 681b2a6..df54020 100644
<dependency>
<groupId>org.jboss.as</groupId>
-@@ -955,10 +959,12 @@
+@@ -989,10 +993,12 @@
<artifactId>jboss-as-webservices-server-integration</artifactId>
</dependency>
@@ -111,7 +111,7 @@ index 681b2a6..df54020 100644
<dependency>
<groupId>org.jboss.classfilewriter</groupId>
-@@ -1077,12 +1083,12 @@
+@@ -1106,12 +1112,12 @@
<dependency>
<groupId>org.jboss.jbossts</groupId>
@@ -126,7 +126,7 @@ index 681b2a6..df54020 100644
</dependency>
<dependency>
-@@ -1090,6 +1096,7 @@
+@@ -1119,6 +1125,7 @@
<artifactId>jbosstxbridge</artifactId>
</dependency>
@@ -134,7 +134,7 @@ index 681b2a6..df54020 100644
<dependency>
<groupId>org.jboss.jbossts</groupId>
<artifactId>jbossxts</artifactId>
-@@ -1099,6 +1106,7 @@
+@@ -1128,6 +1135,7 @@
<groupId>org.jboss.jbossts</groupId>
<artifactId>jbossxts-api</artifactId>
</dependency>
@@ -143,7 +143,7 @@ index 681b2a6..df54020 100644
<dependency>
<groupId>org.jboss.metadata</groupId>
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 8bdf514..de651d6 100644
+index ff9b9cf..4785e5f 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
@@ -41,7 +41,7 @@
@@ -155,9 +155,9 @@ index 8bdf514..de651d6 100644
<module name="org.jboss.as.clustering.api"/>
<module name="org.jboss.as.clustering.ejb3.infinispan" services="import" optional="true"/>
<module name="org.jboss.as.clustering.infinispan"/>
-@@ -51,7 +51,7 @@
- <!-- So we can access its integration API -->
- <module name="org.jboss.as.connector"/>
+@@ -54,7 +54,7 @@
+ in EJB client context-->
+ <module name="org.jboss.as.domain-management"/>
<module name="org.jboss.as.ee"/>
- <module name="org.jboss.as.jacorb"/>
+ <module name="org.jboss.as.jacorb" optional="true"/>
@@ -190,7 +190,7 @@ index 45a37ee..eb2e8f4 100644
<include-set>
<path name="org/omg/ATLAS"/>
diff --git a/ejb3/pom.xml b/ejb3/pom.xml
-index 0896e09..8656484 100644
+index fc757ab..72a516b 100644
--- a/ejb3/pom.xml
+++ b/ejb3/pom.xml
@@ -47,6 +47,13 @@ vi:ts=4:sw=4:expandtab
@@ -207,7 +207,7 @@ index 0896e09..8656484 100644
</configuration>
</plugin>
<plugin>
-@@ -90,10 +97,12 @@ vi:ts=4:sw=4:expandtab
+@@ -89,10 +96,12 @@ vi:ts=4:sw=4:expandtab
<artifactId>jboss-as-ee</artifactId>
</dependency>
@@ -221,34 +221,32 @@ index 0896e09..8656484 100644
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/deployment/EjbDeploymentInformation.java b/ejb3/src/main/java/org/jboss/as/ejb3/deployment/EjbDeploymentInformation.java
-index 370747e..8f2858f 100644
+index 249a5f6..71b4f16 100644
--- a/ejb3/src/main/java/org/jboss/as/ejb3/deployment/EjbDeploymentInformation.java
+++ b/ejb3/src/main/java/org/jboss/as/ejb3/deployment/EjbDeploymentInformation.java
-@@ -1,13 +1,12 @@
- package org.jboss.as.ejb3.deployment;
+@@ -2,7 +2,6 @@ package org.jboss.as.ejb3.deployment;
-+import java.util.Collection;
-+import java.util.Map;
-+
import org.jboss.as.ee.component.ComponentView;
import org.jboss.as.ejb3.component.EJBComponent;
-import org.jboss.as.ejb3.iiop.EjbIIOPService;
import org.jboss.msc.value.InjectedValue;
--import java.util.Collection;
--import java.util.Map;
--
- /**
- * Runtime information about an EJB in a module
- *
-@@ -23,14 +22,18 @@ public class EjbDeploymentInformation {
+ import java.util.Collection;
+@@ -26,7 +25,10 @@ public class EjbDeploymentInformation {
private final Map<String, InjectedValue<ComponentView>> componentViews;
+ /*
private final InjectedValue<EjbIIOPService> iorFactory;
+ */
++
+ private final Set<String> remoteViewClassNames = new HashSet<String>();
+ /**
+@@ -37,12 +39,14 @@ public class EjbDeploymentInformation {
+ * @param iorFactory The {@link EjbIIOPService}
+ * @deprecated since 7.1.1.Final - Use {@link #EjbDeploymentInformation(String, org.jboss.msc.value.InjectedValue, java.util.Map, java.util.Map, ClassLoader, org.jboss.msc.value.InjectedValue)} instead
+ */
- public EjbDeploymentInformation(final String ejbName, final InjectedValue<EJBComponent> ejbComponent, final Map<String, InjectedValue<ComponentView>> componentViews, final ClassLoader deploymentClassLoader, final InjectedValue<EjbIIOPService> iorFactory) {
+ public EjbDeploymentInformation(final String ejbName, final InjectedValue<EJBComponent> ejbComponent, final Map<String, InjectedValue<ComponentView>> componentViews, final ClassLoader deploymentClassLoader, final InjectedValue<?> iorFactory) {
this.ejbName = ejbName;
@@ -260,8 +258,27 @@ index 370747e..8f2858f 100644
+ */
}
+ /**
+@@ -55,7 +59,7 @@ public class EjbDeploymentInformation {
+ */
+ public EjbDeploymentInformation(final String ejbName, final InjectedValue<EJBComponent> ejbComponent,
+ final Map<String, InjectedValue<ComponentView>> remoteViews, final Map<String, InjectedValue<ComponentView>> localViews,
+- final ClassLoader deploymentClassLoader, final InjectedValue<EjbIIOPService> iorFactory) {
++ final ClassLoader deploymentClassLoader, final InjectedValue<?> iorFactory) {
+ this.ejbName = ejbName;
+ this.ejbComponent = ejbComponent;
+ this.componentViews = new HashMap<String, InjectedValue<ComponentView>>();
+@@ -67,7 +71,9 @@ public class EjbDeploymentInformation {
+ this.componentViews.putAll(localViews);
+ }
+ this.deploymentClassLoader = deploymentClassLoader;
++ /*
+ this.iorFactory = iorFactory;
++ */
+ }
+
public String getEjbName() {
-@@ -57,7 +60,9 @@ public class EjbDeploymentInformation {
+@@ -94,9 +100,11 @@ public class EjbDeploymentInformation {
return deploymentClassLoader;
}
@@ -270,12 +287,14 @@ index 370747e..8f2858f 100644
return iorFactory.getOptionalValue();
}
+ */
- }
+
+ /**
+ * Returns true if the passed <code>viewClassName</code> represents a remote view of the EJB component.
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/DeploymentRepositoryProcessor.java b/ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/DeploymentRepositoryProcessor.java
-index c956d61..f26ad5e 100644
+index 0f388ca..804a0d8 100644
--- a/ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/DeploymentRepositoryProcessor.java
+++ b/ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/DeploymentRepositoryProcessor.java
-@@ -15,7 +15,6 @@ import org.jboss.as.ejb3.deployment.DeploymentModuleIdentifier;
+@@ -17,7 +17,6 @@ import org.jboss.as.ejb3.deployment.DeploymentModuleIdentifier;
import org.jboss.as.ejb3.deployment.DeploymentRepository;
import org.jboss.as.ejb3.deployment.EjbDeploymentInformation;
import org.jboss.as.ejb3.deployment.ModuleDeployment;
@@ -283,8 +302,8 @@ index c956d61..f26ad5e 100644
import org.jboss.as.server.deployment.DeploymentPhaseContext;
import org.jboss.as.server.deployment.DeploymentUnit;
import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
-@@ -67,10 +66,13 @@ public class DeploymentRepositoryProcessor implements DeploymentUnitProcessor {
- views.put(view.getViewClassName(), componentViewInjectedValue);
+@@ -81,10 +80,13 @@ public class DeploymentRepositoryProcessor implements DeploymentUnitProcessor {
+ }
injectedValues.put(view.getServiceName(), componentViewInjectedValue);
}
+ final InjectedValue<?> iorFactory = null;
@@ -295,7 +314,7 @@ index c956d61..f26ad5e 100644
}
+ */
- EjbDeploymentInformation info = new EjbDeploymentInformation(ejbComponentDescription.getEJBName(), componentInjectedValue, views, module.getClassLoader(), iorFactory);
+ final EjbDeploymentInformation info = new EjbDeploymentInformation(ejbComponentDescription.getEJBName(), componentInjectedValue, remoteViews, localViews, module.getClassLoader(), iorFactory);
deploymentInformationMap.put(ejbComponentDescription.getEJBName(), info);
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/EjbDependencyDeploymentUnitProcessor.java b/ejb3/src/main/java/org/jboss/as/ejb3/deployment/processors/EjbDependencyDeploymentUnitProcessor.java
index 39f8c09..3d89e4f 100644
@@ -323,29 +342,19 @@ index 39f8c09..3d89e4f 100644
// fetch the EjbJarMetaData
//TODO: remove the app client bit after the next EJB release
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Extension.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Extension.java
-index 70f444b..15fde92 100644
+index c38fadc..0458adb 100644
--- a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Extension.java
+++ b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Extension.java
-@@ -22,10 +22,6 @@
+@@ -22,8 +22,6 @@
package org.jboss.as.ejb3.subsystem;
-import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIBE;
-
--import java.util.EnumSet;
--
import org.jboss.as.controller.Extension;
import org.jboss.as.controller.ExtensionContext;
import org.jboss.as.controller.PathElement;
-@@ -39,7 +35,6 @@ import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler
- import org.jboss.as.controller.parsing.ExtensionParsingContext;
- import org.jboss.as.controller.registry.ManagementResourceRegistration;
- import org.jboss.as.controller.registry.OperationEntry;
--import org.jboss.as.controller.registry.OperationEntry.Flag;
- import org.jboss.as.ejb3.subsystem.deployment.EntityBeanResourceDefinition;
- import org.jboss.as.ejb3.subsystem.deployment.MessageDrivenBeanResourceDefinition;
- import org.jboss.as.ejb3.subsystem.deployment.SingletonBeanDeploymentResourceDefinition;
-@@ -49,6 +44,8 @@ import org.jboss.as.threads.ThreadFactoryResolver;
+@@ -46,6 +44,8 @@ import org.jboss.as.threads.ThreadFactoryResolver;
import org.jboss.as.threads.ThreadsServices;
import org.jboss.as.threads.UnboundedQueueThreadPoolResourceDefinition;
@@ -354,7 +363,7 @@ index 70f444b..15fde92 100644
/**
* Extension that provides the EJB3 subsystem.
*
-@@ -106,7 +103,9 @@ public class EJB3Extension implements Extension {
+@@ -106,7 +106,9 @@ public class EJB3Extension implements Extension {
new EJB3ThreadFactoryResolver(), EJB3SubsystemModel.BASE_THREAD_POOL_SERVICE_NAME, registerRuntimeOnly));
// subsystem=ejb3/service=iiop
@@ -365,7 +374,7 @@ index 70f444b..15fde92 100644
if (registerRuntimeOnly) {
ResourceDefinition deploymentsDef = new SimpleResourceDefinition(PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM, SUBSYSTEM_NAME),
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Subsystem12Parser.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Subsystem12Parser.java
-index e0a469e..c04f4cc 100644
+index 3da8c9b..8be4157 100644
--- a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Subsystem12Parser.java
+++ b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3Subsystem12Parser.java
@@ -22,6 +22,15 @@
@@ -475,7 +484,7 @@ index e0a469e..c04f4cc 100644
private void parseMDB(final XMLExtendedStreamReader reader, List<ModelNode> operations, final ModelNode ejb3SubsystemAddOperation) throws XMLStreamException {
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3SubsystemAdd.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3SubsystemAdd.java
-index 63814bc..a3fd636 100644
+index d2ac7a3..9f67c50 100644
--- a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3SubsystemAdd.java
+++ b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3SubsystemAdd.java
@@ -22,6 +22,12 @@
@@ -577,16 +586,16 @@ index 63814bc..a3fd636 100644
//setup ejb: namespace
EjbNamingContextSetup.setupEjbNamespace();
-@@ -189,7 +192,9 @@ class EJB3SubsystemAdd extends AbstractBoottimeAddStepHandler {
+@@ -187,7 +190,9 @@ class EJB3SubsystemAdd extends AbstractBoottimeAddStepHandler {
+ processorTarget.addDeploymentProcessor(Phase.POST_MODULE, Phase.POST_MODULE_EJB_HOME_MERGE, new HomeViewMergingProcessor(appclient));
processorTarget.addDeploymentProcessor(Phase.POST_MODULE, Phase.POST_MODULE_EJB_REF, new EjbRefProcessor(appclient));
- processorTarget.addDeploymentProcessor(Phase.POST_MODULE, Phase.POST_MODULE_EJB_CLIENT_CONTEXT_SETUP, new EjbClientContextSetupProcessor());
processorTarget.addDeploymentProcessor(Phase.POST_MODULE, Phase.POST_MODULE_EJB_BUSINESS_VIEW_ANNOTATION, new BusinessViewAnnotationProcessor(appclient));
+ /*
processorTarget.addDeploymentProcessor(Phase.POST_MODULE, Phase.POST_MODULE_EJB_ORB_BIND, new IIOPJndiBindingProcessor());
+ */
processorTarget.addDeploymentProcessor(Phase.POST_MODULE, Phase.POST_MODULE_EJB_JNDI_BINDINGS, new EjbJndiBindingsDeploymentUnitProcessor(appclient));
+ processorTarget.addDeploymentProcessor(Phase.POST_MODULE, Phase.POST_MODULE_EJB_CLIENT_METADATA, new EJBClientDescriptorMetaDataProcessor());
- processorTarget.addDeploymentProcessor(Phase.INSTALL, Phase.INSTALL_EJB_JACC_PROCESSING, new JaccEjbDeploymentProcessor());
@@ -298,6 +303,7 @@ class EJB3SubsystemAdd extends AbstractBoottimeAddStepHandler {
.install());
@@ -604,7 +613,7 @@ index 63814bc..a3fd636 100644
}
diff --git a/jsr77/src/main/java/org/jboss/as/jsr77/ejb/ManagementEjbDeploymentInformation.java b/jsr77/src/main/java/org/jboss/as/jsr77/ejb/ManagementEjbDeploymentInformation.java
-index 24bd92b..f2360c7 100644
+index 277b8cf..f91eae7 100644
--- a/jsr77/src/main/java/org/jboss/as/jsr77/ejb/ManagementEjbDeploymentInformation.java
+++ b/jsr77/src/main/java/org/jboss/as/jsr77/ejb/ManagementEjbDeploymentInformation.java
@@ -26,7 +26,6 @@ import java.util.Map;
@@ -615,20 +624,20 @@ index 24bd92b..f2360c7 100644
import org.jboss.msc.value.InjectedValue;
/**
-@@ -38,7 +37,7 @@ public class ManagementEjbDeploymentInformation extends EjbDeploymentInformation
+@@ -37,7 +36,7 @@ import org.jboss.msc.value.InjectedValue;
+ public class ManagementEjbDeploymentInformation extends EjbDeploymentInformation {
public ManagementEjbDeploymentInformation(String ejbName, Map<String, InjectedValue<ComponentView>> componentViews, ClassLoader deploymentClassLoader) {
- // FIXME ManagementEjbDeploymentInformation constructor
-- super(ejbName, new InjectedValue<EJBComponent>(), componentViews, deploymentClassLoader, new InjectedValue<EjbIIOPService>());
-+ super(ejbName, new InjectedValue<EJBComponent>(), componentViews, deploymentClassLoader, new InjectedValue());
+- super(ejbName, new InjectedValue<EJBComponent>(), componentViews, null, deploymentClassLoader, new InjectedValue<EjbIIOPService>());
++ super(ejbName, new InjectedValue<EJBComponent>(), componentViews, null, deploymentClassLoader, new InjectedValue());
}
@Override
diff --git a/pom.xml b/pom.xml
-index b240159..c773521 100644
+index 390e45e..c4ea094 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -392,6 +392,7 @@
+@@ -445,6 +445,7 @@
<exclude>org.apache.xalan:xalan</exclude>
<exclude>org.hibernate:ejb3-persistence</exclude>
<exclude>org.hibernate.java-persistence:jpa-api</exclude>
@@ -636,7 +645,7 @@ index b240159..c773521 100644
<exclude>org.jboss.integration:jboss-jca-spi</exclude>
<exclude>org.jboss.interceptor:jboss-interceptor-api</exclude>
<exclude>org.jboss.javaee:jboss-javaee</exclude>
-@@ -3633,7 +3634,7 @@
+@@ -3717,7 +3718,7 @@
<dependency>
<groupId>org.jboss.jbossts</groupId>
@@ -645,7 +654,7 @@ index b240159..c773521 100644
<version>${version.org.jboss.jbossts.jbossjts}</version>
<exclusions>
<exclusion>
-@@ -3765,7 +3766,7 @@
+@@ -3853,7 +3854,7 @@
<dependency>
<groupId>org.jboss.jbossts</groupId>
@@ -654,8 +663,8 @@ index b240159..c773521 100644
<version>${version.org.jboss.jbossts.jbossjts-integration}</version>
<exclusions>
<exclusion>
-@@ -5923,7 +5924,9 @@
- <module>dist</module>
+@@ -6003,7 +6004,9 @@
+ <module>ee-deployment</module>
<module>ejb3</module>
<module>host-controller</module>
+ <!--
@@ -664,7 +673,7 @@ index b240159..c773521 100644
<module>jaxr</module>
<module>jaxrs</module>
<module>jdr</module>
-@@ -5943,7 +5946,9 @@
+@@ -6024,7 +6027,9 @@
<module>web</module>
<module>webservices</module>
<module>weld</module>
@@ -675,12 +684,12 @@ index b240159..c773521 100644
<module>testsuite</module>
</modules>
diff --git a/transactions/pom.xml b/transactions/pom.xml
-index b20e896..491b36e 100644
+index e37e212..efd96c1 100644
--- a/transactions/pom.xml
+++ b/transactions/pom.xml
-@@ -46,17 +46,19 @@
+@@ -46,23 +46,24 @@
<groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-server</artifactId>
+ <artifactId>jboss-as-ee</artifactId>
</dependency>
+ <!--
<dependency>
@@ -696,19 +705,17 @@ index b20e896..491b36e 100644
<groupId>org.jboss.jbossts</groupId>
- <artifactId>jbossjts</artifactId>
+ <artifactId>jbossjta</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.ironjacamar</groupId>
-@@ -66,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.jboss.jbossts</groupId>
- <artifactId>jbossjts-integration</artifactId>
+ <artifactId>jbossjta-integration</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.ironjacamar</groupId>
-@@ -108,6 +110,9 @@
+ </dependency>
+-
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+@@ -96,6 +97,9 @@
<compilerArgument>
-AgeneratedTranslationFilesPath=${project.basedir}/target/generated-translation-files
</compilerArgument>
@@ -856,18 +863,19 @@ index 084cf58..9ae11fb 100644
value = new com.arjuna.ats.internal.jbossatx.jta.jca.XATerminator();
}
diff --git a/transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionSubsystemAdd.java b/transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionSubsystemAdd.java
-index eb44134..aac21dc 100644
+index 696d358..c92e3ca 100644
--- a/transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionSubsystemAdd.java
+++ b/transactions/src/main/java/org/jboss/as/txn/subsystem/TransactionSubsystemAdd.java
-@@ -28,7 +28,6 @@ import javax.transaction.TransactionSynchronizationRegistry;
+@@ -70,8 +70,6 @@ import org.omg.CORBA.ORB;
import com.arjuna.ats.internal.arjuna.utils.UuidProcessId;
import com.arjuna.ats.jbossatx.jta.RecoveryManagerService;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
- import org.jboss.as.controller.AbstractBoottimeAddStepHandler;
- import org.jboss.as.controller.OperationContext;
- import org.jboss.as.controller.OperationFailedException;
-@@ -180,7 +179,9 @@ class TransactionSubsystemAdd extends AbstractBoottimeAddStepHandler {
+-
+
+ /**
+ * Adds the transaction management subsystem.
+@@ -181,7 +179,9 @@ class TransactionSubsystemAdd extends AbstractBoottimeAddStepHandler {
//always propagate the transaction context
//TODO: need a better way to do this, but this value gets cached in a static
//so we need to make sure we set it before anything tries to read it
@@ -878,5 +886,5 @@ index eb44134..aac21dc 100644
context.addStep(new AbstractDeploymentChainStep() {
protected void execute(final DeploymentProcessorTarget processorTarget) {
--
-1.7.9
+1.7.10
diff --git a/0001-Disable-checkstyle.patch b/0002-Disable-checkstyle.patch
similarity index 88%
rename from 0001-Disable-checkstyle.patch
rename to 0002-Disable-checkstyle.patch
index 8993007..d72231b 100644
--- a/0001-Disable-checkstyle.patch
+++ b/0002-Disable-checkstyle.patch
@@ -1,19 +1,19 @@
-From 153bc9a20315293f4d954a20e46ce14387f6ebe0 Mon Sep 17 00:00:00 2001
+From 44e68b35b47ca0ff9b4ee470cebe2c3522435e52 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 01/15] Disable checkstyle
+Subject: [PATCH 02/43] Disable checkstyle
---
pom.xml | 33 ---------------------------------
- 1 files changed, 0 insertions(+), 33 deletions(-)
+ 1 file changed, 33 deletions(-)
diff --git a/pom.xml b/pom.xml
-index f2358fa..5b7b314 100644
+index c4ea094..a9336c4 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -286,10 +286,6 @@
- <build>
- <plugins>
+@@ -309,10 +309,6 @@
+ </plugin>
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
@@ -22,7 +22,7 @@ index f2358fa..5b7b314 100644
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
-@@ -345,35 +341,6 @@
+@@ -368,35 +364,6 @@
</configuration>
</plugin>
@@ -59,5 +59,5 @@ index f2358fa..5b7b314 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
-1.7.9
+1.7.10
diff --git a/0002-Fix-initd-script.patch b/0003-Fix-initd-script.patch
similarity index 82%
rename from 0002-Fix-initd-script.patch
rename to 0003-Fix-initd-script.patch
index ce19c74..55b4f16 100644
--- a/0002-Fix-initd-script.patch
+++ b/0003-Fix-initd-script.patch
@@ -1,11 +1,11 @@
-From d9181497b30c04ab6ab061270adbd225139f385e Mon Sep 17 00:00:00 2001
+From d9ac6b0904ae011139e640afb31f60d17e54d7fa 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 02/15] Fix initd script
+Subject: [PATCH 03/43] Fix initd script
---
build/src/main/resources/bin/init.d/jboss-as.conf | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/build/src/main/resources/bin/init.d/jboss-as.conf b/build/src/main/resources/bin/init.d/jboss-as.conf
index 0bfc942..72a356b 100644
@@ -29,5 +29,5 @@ index 0bfc942..72a356b 100644
+#
+JBOSS_CONFIG=standalone-minimalistic.xml
--
-1.7.9
+1.7.10
diff --git a/0003-Build-additional-modules.patch b/0004-Build-additional-modules.patch
similarity index 92%
rename from 0003-Build-additional-modules.patch
rename to 0004-Build-additional-modules.patch
index bc188da..455103f 100644
--- a/0003-Build-additional-modules.patch
+++ b/0004-Build-additional-modules.patch
@@ -1,7 +1,7 @@
-From 8efe99ccc661d17de9ca6fcafdc2d94b13ab558b Mon Sep 17 00:00:00 2001
+From 124639c0fbf43250114cf07e63154db5d659420f Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann at fedoraproject.org>
Date: Thu, 26 Jan 2012 08:59:31 -0500
-Subject: [PATCH 03/15] Build additional modules
+Subject: [PATCH 04/43] Build additional modules
---
build/build.xml | 40 ++++++++++++++++++++--------------------
@@ -10,10 +10,10 @@ Subject: [PATCH 03/15] Build additional modules
3 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 4e03ca7..6873789 100644
+index 4c56cf3..6b729dc 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -122,8 +122,16 @@
+@@ -125,8 +125,16 @@
~ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-->
@@ -30,7 +30,7 @@ index 4e03ca7..6873789 100644
<module-def name="javax.xml.stream.api"/>
<module-def name="org.apache.log4j">
-@@ -154,6 +162,14 @@
+@@ -157,6 +165,14 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-domain-management"/>
</module-def>
@@ -45,7 +45,7 @@ index 4e03ca7..6873789 100644
<module-def name="org.jboss.as.embedded">
<maven-resource group="org.jboss.as" artifact="jboss-as-embedded"/>
</module-def>
-@@ -239,6 +255,10 @@
+@@ -246,6 +262,10 @@
<maven-resource group="org.jboss.logmanager" artifact="jboss-logmanager-log4j"/>
</module-def>
@@ -56,7 +56,7 @@ index 4e03ca7..6873789 100644
<module-def name="org.jboss.remoting3">
<maven-resource group="org.jboss.remoting3" artifact="jboss-remoting"/>
</module-def>
-@@ -337,10 +357,6 @@
+@@ -344,10 +364,6 @@
<maven-resource group="javax.activation" artifact="activation"/>
</module-def>
@@ -67,7 +67,7 @@ index 4e03ca7..6873789 100644
<module-def name="javax.ejb.api">
<maven-resource group="org.jboss.spec.javax.ejb" artifact="jboss-ejb-api_3.1_spec"/>
</module-def>
-@@ -369,10 +385,6 @@
+@@ -376,10 +392,6 @@
<maven-resource group="javax.inject" artifact="javax.inject"/>
</module-def>
@@ -78,7 +78,7 @@ index 4e03ca7..6873789 100644
<module-def name="javax.jms.api">
<maven-resource group="org.jboss.spec.javax.jms" artifact="jboss-jms-api_1.1_spec"/>
</module-def>
-@@ -740,14 +752,6 @@
+@@ -759,14 +771,6 @@
<module-def name="org.jboss.as.domain-add-user" />
@@ -93,7 +93,7 @@ index 4e03ca7..6873789 100644
<module-def name="org.jboss.as.ejb3">
<maven-resource group="org.jboss.as" artifact="jboss-as-ejb3"/>
</module-def>
-@@ -833,10 +837,6 @@
+@@ -850,10 +854,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-pojo"/>
</module-def>
@@ -105,10 +105,10 @@ index 4e03ca7..6873789 100644
<maven-resource group="org.jboss.as" artifact="jboss-as-osgi-service"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index ee82e34..6142148 100644
+index 5bc6527..6cd0244 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -111,6 +111,16 @@
+@@ -135,6 +135,16 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -125,7 +125,7 @@ index ee82e34..6142148 100644
<artifactId>jboss-as-jmx</artifactId>
</dependency>
-@@ -160,6 +170,11 @@
+@@ -189,6 +199,11 @@
</dependency>
<dependency>
@@ -137,7 +137,7 @@ index ee82e34..6142148 100644
<groupId>org.jboss.msc</groupId>
<artifactId>jboss-msc</artifactId>
</dependency>
-@@ -807,16 +822,6 @@
+@@ -838,16 +853,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -154,7 +154,7 @@ index ee82e34..6142148 100644
<artifactId>jboss-as-ejb3</artifactId>
</dependency>
-@@ -877,11 +882,6 @@
+@@ -910,11 +915,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -167,10 +167,10 @@ index ee82e34..6142148 100644
</dependency>
diff --git a/pom.xml b/pom.xml
-index 5b7b314..b240159 100644
+index a9336c4..01dcaf3 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -270,9 +270,12 @@
+@@ -277,9 +277,12 @@
<module>deployment-repository</module>
<module>domain-http</module>
<module>domain-management</module>
@@ -184,16 +184,16 @@ index 5b7b314..b240159 100644
<module>network</module>
<module>platform-mbean</module>
<module>process-controller</module>
-@@ -5918,8 +5921,6 @@
- <module>demos</module>
+@@ -5967,8 +5970,6 @@
+ <module>connector</module>
<module>deployment-scanner</module>
<module>dist</module>
- <module>ee</module>
- <module>ee-deployment</module>
<module>ejb3</module>
<module>host-controller</module>
- <module>jacorb</module>
-@@ -5932,7 +5933,6 @@
+ <!--
+@@ -5983,7 +5984,6 @@
<module>mail</module>
<module>messaging</module>
<module>modcluster</module>
@@ -202,5 +202,5 @@ index 5b7b314..b240159 100644
<module>pojo</module>
<module>remoting-test</module>
--
-1.7.9
+1.7.10
diff --git a/0005-Adding-javax.transaction-to-the-minimal-build.patch b/0005-Adding-javax.transaction-to-the-minimal-build.patch
index a30c920..e809b8d 100644
--- a/0005-Adding-javax.transaction-to-the-minimal-build.patch
+++ b/0005-Adding-javax.transaction-to-the-minimal-build.patch
@@ -1,17 +1,17 @@
-From eaf4c7d6a2f5cad041fe02e2484b16d78cb40dd4 Mon Sep 17 00:00:00 2001
+From db7b649b3423a6da8b54379f91573ca0758dead4 Mon Sep 17 00:00:00 2001
From: Oved Ourfali <ovedo at redhat.com>
Date: Tue, 7 Feb 2012 15:23:21 +0200
-Subject: [PATCH 05/15] Adding javax.transaction to the minimal build
+Subject: [PATCH 05/43] Adding javax.transaction to the minimal build
---
build/build.xml | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 6873789..ad0613e 100644
+index 6b729dc..410cffa 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -132,6 +132,10 @@
+@@ -135,6 +135,10 @@
<maven-resource group="org.jboss.spec.javax.interceptor" artifact="jboss-interceptors-api_1.1_spec"/>
</module-def>
@@ -22,7 +22,7 @@ index 6873789..ad0613e 100644
<module-def name="javax.xml.stream.api"/>
<module-def name="org.apache.log4j">
-@@ -433,10 +437,6 @@
+@@ -440,10 +444,6 @@
<maven-resource group="org.jboss.spec.javax.servlet.jstl" artifact="jboss-jstl-api_1.2_spec"/>
</module-def>
@@ -34,5 +34,5 @@ index 6873789..ad0613e 100644
<maven-resource group="javax.validation" artifact="validation-api"/>
</module-def>
--
-1.7.9
+1.7.10
diff --git a/0006-adding-javax.validation-to-build.xml.patch b/0006-adding-javax.validation-to-build.xml.patch
index 5f56563..9d658a1 100644
--- a/0006-adding-javax.validation-to-build.xml.patch
+++ b/0006-adding-javax.validation-to-build.xml.patch
@@ -1,17 +1,17 @@
-From 9ce3feda00eb9fa4007298d207b7e12fc2931ef1 Mon Sep 17 00:00:00 2001
+From 548d3752e6dea157707059dfc0febac59e676ecb Mon Sep 17 00:00:00 2001
From: Oved Ourfali <ovedo at redhat.com>
Date: Sun, 12 Feb 2012 12:09:59 +0200
-Subject: [PATCH 06/15] adding javax.validation to build.xml
+Subject: [PATCH 06/43] adding javax.validation to build.xml
---
build/build.xml | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index ad0613e..b61087e 100644
+index 410cffa..e17f514 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -136,6 +136,10 @@
+@@ -139,6 +139,10 @@
<maven-resource group="org.jboss.spec.javax.transaction" artifact="jboss-transaction-api_1.1_spec"/>
</module-def>
@@ -22,7 +22,7 @@ index ad0613e..b61087e 100644
<module-def name="javax.xml.stream.api"/>
<module-def name="org.apache.log4j">
-@@ -437,10 +441,6 @@
+@@ -444,10 +448,6 @@
<maven-resource group="org.jboss.spec.javax.servlet.jstl" artifact="jboss-jstl-api_1.2_spec"/>
</module-def>
@@ -34,5 +34,5 @@ index ad0613e..b61087e 100644
<maven-resource group="org.jboss.spec.javax.ws.rs" artifact="jboss-jaxrs-api_1.1_spec"/>
</module-def>
--
-1.7.9
+1.7.10
diff --git a/0010-adding-org.jboss.metadata-to-minimal-build.patch b/0007-adding-org.jboss.metadata-to-minimal-build.patch
similarity index 93%
rename from 0010-adding-org.jboss.metadata-to-minimal-build.patch
rename to 0007-adding-org.jboss.metadata-to-minimal-build.patch
index 2aa4eff..490e6c1 100644
--- a/0010-adding-org.jboss.metadata-to-minimal-build.patch
+++ b/0007-adding-org.jboss.metadata-to-minimal-build.patch
@@ -1,7 +1,7 @@
-From f683c830938f2088f67a59902a9f84c3ef9cf81d Mon Sep 17 00:00:00 2001
+From 3311be4096e89e11b2c22a30e74e9b5c2024a270 Mon Sep 17 00:00:00 2001
From: Oved Ourfali <ovedo at redhat.com>
Date: Thu, 16 Feb 2012 09:18:05 +0200
-Subject: [PATCH 10/15] adding org.jboss.metadata to minimal build
+Subject: [PATCH 07/43] adding org.jboss.metadata to minimal build
---
build/build.xml | 16 ++++++++--------
@@ -9,10 +9,10 @@ Subject: [PATCH 10/15] adding org.jboss.metadata to minimal build
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 8e7dfd6..3faf249 100644
+index e17f514..314bbaf 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -244,6 +244,14 @@
+@@ -248,6 +248,14 @@
<maven-resource group="org.jboss.marshalling" artifact="jboss-marshalling-river"/>
</module-def>
@@ -27,7 +27,7 @@ index 8e7dfd6..3faf249 100644
<module-def name="org.jboss.modules"/>
<module-def name="org.jboss.msc">
-@@ -946,14 +954,6 @@
+@@ -960,14 +968,6 @@
<maven-resource group="org.jboss.jbossts" artifact="jbossjta-integration"/>
</module-def>
@@ -43,10 +43,10 @@ index 8e7dfd6..3faf249 100644
<maven-resource group="org.jboss.netty" artifact="netty"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index df54020..5c961ac 100644
+index 6cd0244..7eccd2e 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -160,6 +160,31 @@
+@@ -194,6 +194,31 @@
</dependency>
<dependency>
@@ -78,7 +78,7 @@ index df54020..5c961ac 100644
<groupId>org.jboss.modules</groupId>
<artifactId>jboss-modules</artifactId>
</dependency>
-@@ -1109,31 +1134,6 @@
+@@ -1138,31 +1163,6 @@
-->
<dependency>
@@ -111,5 +111,5 @@ index df54020..5c961ac 100644
<artifactId>mod_cluster-container-spi</artifactId>
<version>${version.org.jboss.mod_cluster}</version>
--
-1.7.9
+1.7.10
diff --git a/0011-adding-org.jboss.ejb3-module-to-minimal-build.patch b/0008-adding-org.jboss.ejb3-module-to-minimal-build.patch
similarity index 87%
rename from 0011-adding-org.jboss.ejb3-module-to-minimal-build.patch
rename to 0008-adding-org.jboss.ejb3-module-to-minimal-build.patch
index e54060d..6a03bf3 100644
--- a/0011-adding-org.jboss.ejb3-module-to-minimal-build.patch
+++ b/0008-adding-org.jboss.ejb3-module-to-minimal-build.patch
@@ -1,7 +1,7 @@
-From e5438f991c623867ecc10059a65a088852c363b7 Mon Sep 17 00:00:00 2001
+From eb779116544945f2568a24644681330f929351be Mon Sep 17 00:00:00 2001
From: Oved Ourfali <ovedo at redhat.com>
Date: Thu, 16 Feb 2012 10:32:38 +0200
-Subject: [PATCH 11/15] adding org.jboss.ejb3 module to minimal build
+Subject: [PATCH 08/43] adding org.jboss.ejb3 module to minimal build
---
build/build.xml | 12 ++++++------
@@ -9,10 +9,10 @@ Subject: [PATCH 11/15] adding org.jboss.ejb3 module to minimal build
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 3faf249..5d7a1d2 100644
+index 314bbaf..6945de2 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -227,6 +227,12 @@
+@@ -231,6 +231,12 @@
<maven-resource group="org.jboss" artifact="jboss-dmr"/>
</module-def>
@@ -25,7 +25,7 @@ index 3faf249..5d7a1d2 100644
<module-def name="org.jboss.invocation">
<maven-resource group="org.jboss.invocation" artifact="jboss-invocation"/>
</module-def>
-@@ -899,12 +905,6 @@
+@@ -913,12 +919,6 @@
<maven-resource group="org.jboss" artifact="jboss-ejb-client"/>
</module-def>
@@ -39,10 +39,10 @@ index 3faf249..5d7a1d2 100644
<!-- Bundling external content into deployments -->
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 5c961ac..6d054ab 100644
+index 7eccd2e..61e4776 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -130,6 +130,11 @@
+@@ -159,6 +159,11 @@
</dependency>
<dependency>
@@ -54,7 +54,7 @@ index 5c961ac..6d054ab 100644
<groupId>org.jboss.invocation</groupId>
<artifactId>jboss-invocation</artifactId>
</dependency>
-@@ -1007,11 +1012,6 @@
+@@ -1041,11 +1046,6 @@
</dependency>
<dependency>
@@ -67,5 +67,5 @@ index 5c961ac..6d054ab 100644
<artifactId>jboss-as-jpa</artifactId>
</dependency>
--
-1.7.9
+1.7.10
diff --git a/0012-adding-org.jboss.as.logging.patch b/0009-adding-org.jboss.as.logging.patch
similarity index 71%
rename from 0012-adding-org.jboss.as.logging.patch
rename to 0009-adding-org.jboss.as.logging.patch
index a2431ac..6844603 100644
--- a/0012-adding-org.jboss.as.logging.patch
+++ b/0009-adding-org.jboss.as.logging.patch
@@ -1,19 +1,19 @@
-From 1656e5fcb27222935c04a942216329a1837707ea Mon Sep 17 00:00:00 2001
+From c494bf3e696bbcd14f47eb2f6f17430b342e589b Mon Sep 17 00:00:00 2001
From: Oved Ourfali <ovedo at redhat.com>
Date: Thu, 16 Feb 2012 14:15:11 +0200
-Subject: [PATCH 12/15] adding org.jboss.as.logging
+Subject: [PATCH 09/43] adding org.jboss.as.logging
---
build/build.xml | 8 ++++----
build/pom.xml | 10 +++++-----
- pom.xml | 1 +
- 3 files changed, 10 insertions(+), 9 deletions(-)
+ pom.xml | 2 +-
+ 3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 5d7a1d2..695ba6c 100644
+index 6945de2..a9c472c 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -185,6 +185,10 @@
+@@ -189,6 +189,10 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-jmx"/>
</module-def>
@@ -24,7 +24,7 @@ index 5d7a1d2..695ba6c 100644
<module-def name="org.jboss.as.network">
<maven-resource group="org.jboss.as" artifact="jboss-as-network"/>
</module-def>
-@@ -826,10 +830,6 @@
+@@ -840,10 +844,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-jpa-util"/>
</module-def>
@@ -36,22 +36,22 @@ index 5d7a1d2..695ba6c 100644
<maven-resource group="org.jboss.as" artifact="jboss-as-mail"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 6d054ab..19726e2 100644
+index 61e4776..2c0855c 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -130,6 +130,11 @@
- </dependency>
+@@ -155,6 +155,11 @@
<dependency>
-+ <groupId>org.jboss.as</groupId>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-logging</artifactId>
+ </dependency>
+
+ <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
++ <groupId>org.jboss.as</groupId>
+ <artifactId>jbossweb-native</artifactId>
</dependency>
-@@ -891,11 +896,6 @@
+
+@@ -925,11 +930,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -64,10 +64,10 @@ index 6d054ab..19726e2 100644
</dependency>
diff --git a/pom.xml b/pom.xml
-index c773521..15c94de 100644
+index 01dcaf3..ee91f35 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -275,6 +275,7 @@
+@@ -282,6 +282,7 @@
<module>embedded</module>
<module>jmx</module>
<module>management-client-content</module>
@@ -75,6 +75,14 @@ index c773521..15c94de 100644
<module>naming</module>
<module>network</module>
<module>platform-mbean</module>
+@@ -5980,7 +5981,6 @@
+ <module>jdr</module>
+ <module>jpa</module>
+ <module>jsr77</module>
+- <module>logging</module>
+ <module>mail</module>
+ <module>messaging</module>
+ <module>modcluster</module>
--
-1.7.9
+1.7.10
diff --git a/0010-adding-org.hibernate.validator.patch b/0010-adding-org.hibernate.validator.patch
new file mode 100644
index 0000000..4f6672a
--- /dev/null
+++ b/0010-adding-org.hibernate.validator.patch
@@ -0,0 +1,66 @@
+From fe3bdcbf88fc7e683e323315e74940f101cf0ddf Mon Sep 17 00:00:00 2001
+From: Oved Ourfali <ovedo at redhat.com>
+Date: Wed, 15 Feb 2012 15:16:51 +0200
+Subject: [PATCH 10/43] adding org.hibernate.validator
+
+---
+ build/build.xml | 7 ++++---
+ build/pom.xml | 10 +++++-----
+ 2 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index a9c472c..1de5496 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -149,6 +149,10 @@
+ <maven-resource group="log4j" artifact="log4j"/>
+ </module-def>
+
++ <module-def name="org.hibernate.validator">
++ <maven-resource group="org.hibernate" artifact="hibernate-validator"/>
++ </module-def>
++
+ <module-def name="org.jboss.as.controller">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-controller"/>
+ </module-def>
+@@ -666,9 +670,6 @@
+ <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>
+
+ <module-def name="org.hornetq">
+ <maven-resource group="org.hornetq" artifact="hornetq-core"/>
+diff --git a/build/pom.xml b/build/pom.xml
+index 2c0855c..cd0aa75 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -112,6 +112,11 @@
+ <artifactId>log4j</artifactId>
+ </dependency>
+
++ <dependency>
++ <groupId>org.hibernate</groupId>
++ <artifactId>hibernate-validator</artifactId>
++ </dependency>
++
+ <!-- TODO: why do we need jandex in minimal? -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+@@ -691,11 +696,6 @@
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+- <artifactId>hibernate-validator</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-envers</artifactId>
+ </dependency>
+
+--
+1.7.10
+
diff --git a/0011-adding-org.jboss.remote-naming-to-minimal-build.patch b/0011-adding-org.jboss.remote-naming-to-minimal-build.patch
new file mode 100644
index 0000000..7c06527
--- /dev/null
+++ b/0011-adding-org.jboss.remote-naming-to-minimal-build.patch
@@ -0,0 +1,67 @@
+From aad0b503d6a840fbc8ddfa9a054224959f5ef106 Mon Sep 17 00:00:00 2001
+From: Oved Ourfali <ovedo at redhat.com>
+Date: Sun, 19 Feb 2012 16:10:01 +0200
+Subject: [PATCH 11/43] adding org.jboss.remote-naming to minimal build
+
+---
+ build/build.xml | 8 ++++----
+ build/pom.xml | 10 +++++-----
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 1de5496..6584ab8 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -300,6 +300,10 @@
+ <maven-resource group="org.jboss.remoting3" artifact="jboss-remoting"/>
+ </module-def>
+
++ <module-def name="org.jboss.remote-naming">
++ <maven-resource group="org.jboss" artifact="jboss-remote-naming"/>
++ </module-def>
++
+ <module-def name="org.jboss.remoting3.remoting-jmx">
+ <maven-resource group="org.jboss.remotingjmx" artifact="remoting-jmx"/>
+ </module-def>
+@@ -999,10 +1003,6 @@
+ <maven-resource group="org.jboss.osgi.vfs" artifact="jbosgi-vfs30"/>
+ </module-def>
+
+- <module-def name="org.jboss.remote-naming">
+- <maven-resource group="org.jboss" artifact="jboss-remote-naming"/>
+- </module-def>
+-
+ <module-def name="org.jboss.resteasy.resteasy-atom-provider">
+ <maven-resource group="org.jboss.resteasy" artifact="resteasy-atom-provider" jandex="true"/>
+ </module-def>
+diff --git a/build/pom.xml b/build/pom.xml
+index cd0aa75..355703d 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -247,6 +247,11 @@
+ <groupId>org.jboss.msc</groupId>
+ <artifactId>jboss-msc</artifactId>
+ </dependency>
++
++ <dependency>
++ <groupId>org.jboss</groupId>
++ <artifactId>jboss-remote-naming</artifactId>
++ </dependency>
+ </dependencies>
+
+ <profiles>
+@@ -1232,11 +1237,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.jboss</groupId>
+- <artifactId>jboss-remote-naming</artifactId>
+- </dependency>
+-
+- <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ </dependency>
+--
+1.7.10
+
diff --git a/0017-Enable-org.jboss.as.transactions-module.patch b/0012-Enable-org.jboss.as.transactions-module.patch
similarity index 87%
rename from 0017-Enable-org.jboss.as.transactions-module.patch
rename to 0012-Enable-org.jboss.as.transactions-module.patch
index d48e13c..bc13bd9 100644
--- a/0017-Enable-org.jboss.as.transactions-module.patch
+++ b/0012-Enable-org.jboss.as.transactions-module.patch
@@ -1,7 +1,7 @@
-From 3eefabc83e3ef92e36232f8280d60c9ae0ddfdfd Mon Sep 17 00:00:00 2001
+From a31fe7f75c8347728e0cd6158db3709663773603 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Mon, 20 Feb 2012 12:10:32 +0100
-Subject: [PATCH 17/17] Enable org.jboss.as.transactions module
+Subject: [PATCH 12/43] Enable org.jboss.as.transactions module
---
build/build.xml | 8 ++++----
@@ -10,10 +10,10 @@ Subject: [PATCH 17/17] Enable org.jboss.as.transactions module
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index e515df5..f868cf2 100644
+index 6584ab8..2abd87f 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -223,6 +223,10 @@
+@@ -227,6 +227,10 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-threads"/>
</module-def>
@@ -24,7 +24,7 @@ index e515df5..f868cf2 100644
<module-def name="org.jboss.com.sun.httpserver">
<maven-resource group="org.jboss.com.sun.httpserver" artifact="httpserver"/>
</module-def>
-@@ -871,10 +875,6 @@
+@@ -885,10 +889,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-security"/>
</module-def>
@@ -36,10 +36,10 @@ index e515df5..f868cf2 100644
<maven-resource group="org.jboss.as" artifact="jboss-as-web"/>
<maven-resource group="org.jboss.web" artifact="jasper-jdt"/>
diff --git a/build/pom.xml b/build/pom.xml
-index 19726e2..d8ad535 100644
+index 355703d..65626c0 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -135,6 +135,11 @@
+@@ -169,6 +169,11 @@
</dependency>
<dependency>
@@ -51,7 +51,7 @@ index 19726e2..d8ad535 100644
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
</dependency>
-@@ -971,11 +976,6 @@
+@@ -1010,11 +1015,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -64,10 +64,10 @@ index 19726e2..d8ad535 100644
</dependency>
diff --git a/pom.xml b/pom.xml
-index c894765..115fdc6 100644
+index ee91f35..5f816ce 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -285,6 +285,7 @@
+@@ -292,6 +292,7 @@
<module>server</module>
<module>subsystem-test</module>
<module>threads</module>
@@ -75,7 +75,7 @@ index c894765..115fdc6 100644
</modules>
<build>
-@@ -5942,7 +5943,6 @@
+@@ -5990,7 +5991,6 @@
<module>sar</module>
<module>security</module>
<module>spec-api</module>
@@ -84,5 +84,5 @@ index c894765..115fdc6 100644
<module>webservices</module>
<module>weld</module>
--
-1.7.9.1
+1.7.10
diff --git a/0018-Removing-use-of-HornetqJournalEnvironmentBean-in-Arj.patch b/0013-Removing-use-of-HornetqJournalEnvironmentBean-in-Arj.patch
similarity index 89%
rename from 0018-Removing-use-of-HornetqJournalEnvironmentBean-in-Arj.patch
rename to 0013-Removing-use-of-HornetqJournalEnvironmentBean-in-Arj.patch
index c2cbfad..a5b3d44 100644
--- a/0018-Removing-use-of-HornetqJournalEnvironmentBean-in-Arj.patch
+++ b/0013-Removing-use-of-HornetqJournalEnvironmentBean-in-Arj.patch
@@ -1,15 +1,15 @@
-From 835d31fcad8ed79070c109adf6a8760ddbfcad75 Mon Sep 17 00:00:00 2001
+From 8954dc34c0a51ae3aac4661e9aeca44f647312cd Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Mon, 20 Feb 2012 15:28:46 +0100
-Subject: [PATCH 18/18] Removing use of HornetqJournalEnvironmentBean in
+Subject: [PATCH 13/43] Removing use of HornetqJournalEnvironmentBean in
ArjunaObjectStoreEnvironmentService, as currently we
don't have HornetQ packaged and jboss-jts compiled
with HornetQ support. REVERT this after we package
HornetQ.
---
- .../ArjunaObjectStoreEnvironmentService.java | 13 +------------
- 1 files changed, 1 insertions(+), 12 deletions(-)
+ .../txn/service/ArjunaObjectStoreEnvironmentService.java | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/transactions/src/main/java/org/jboss/as/txn/service/ArjunaObjectStoreEnvironmentService.java b/transactions/src/main/java/org/jboss/as/txn/service/ArjunaObjectStoreEnvironmentService.java
index 0eec14d..6bafbc2 100644
@@ -43,5 +43,5 @@ index 0eec14d..6bafbc2 100644
final ObjectStoreEnvironmentBean stateStoreObjectStoreEnvironmentBean =
BeanPopulator.getNamedInstance(ObjectStoreEnvironmentBean.class, "stateStore");
--
-1.7.9.1
+1.7.10
diff --git a/0014-adding-org.jboss.jboss-transaction-spi-to-minimal-bu.patch b/0014-adding-org.jboss.jboss-transaction-spi-to-minimal-bu.patch
new file mode 100644
index 0000000..eadf847
--- /dev/null
+++ b/0014-adding-org.jboss.jboss-transaction-spi-to-minimal-bu.patch
@@ -0,0 +1,68 @@
+From 213b67701a47ce466f9acb878f434b1e0156fa2a Mon Sep 17 00:00:00 2001
+From: Oved Ourfali <ovedo at redhat.com>
+Date: Tue, 21 Feb 2012 09:44:57 +0200
+Subject: [PATCH 14/43] adding org.jboss.jboss-transaction-spi to minimal
+ build
+
+---
+ build/build.xml | 8 ++++----
+ build/pom.xml | 10 +++++-----
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 2abd87f..095070e 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -300,6 +300,10 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-naming"/>
+ </module-def>
+
++ <module-def name="org.jboss.jboss-transaction-spi">
++ <maven-resource group="org.jboss" artifact="jboss-transaction-spi"/>
++ </module-def>
++
+ <module-def name="org.jboss.remoting3">
+ <maven-resource group="org.jboss.remoting3" artifact="jboss-remoting"/>
+ </module-def>
+@@ -928,10 +932,6 @@
+ <!-- Bundling external content into deployments -->
+ </module-def>
+
+- <module-def name="org.jboss.jboss-transaction-spi">
+- <maven-resource group="org.jboss" artifact="jboss-transaction-spi"/>
+- </module-def>
+-
+ <module-def name="org.jboss.iiop-client">
+ <maven-resource group="org.jboss" artifact="jboss-iiop-client"/>
+ </module-def>
+diff --git a/build/pom.xml b/build/pom.xml
+index 65626c0..9d6e680 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -257,6 +257,11 @@
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-remote-naming</artifactId>
+ </dependency>
++
++ <dependency>
++ <groupId>org.jboss</groupId>
++ <artifactId>jboss-transaction-spi</artifactId>
++ </dependency>
+ </dependencies>
+
+ <profiles>
+@@ -1081,11 +1086,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.jboss</groupId>
+- <artifactId>jboss-transaction-spi</artifactId>
+- </dependency>
+-
+- <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-core</artifactId>
+ </dependency>
+--
+1.7.10
+
diff --git a/0015-adding-jta-modules-to-minimal-build.patch b/0015-adding-jta-modules-to-minimal-build.patch
new file mode 100644
index 0000000..5bd0808
--- /dev/null
+++ b/0015-adding-jta-modules-to-minimal-build.patch
@@ -0,0 +1,85 @@
+From 010882bc859f42425d5e23b9f2ddb53574266ce1 Mon Sep 17 00:00:00 2001
+From: Oved Ourfali <ovedo at redhat.com>
+Date: Tue, 21 Feb 2012 10:23:22 +0200
+Subject: [PATCH 15/43] adding jta modules to minimal build
+
+---
+ build/build.xml | 16 ++++++++--------
+ build/pom.xml | 20 ++++++++++----------
+ 2 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 095070e..d556b42 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -258,6 +258,14 @@
+ <maven-resource group="org.jboss" artifact="jandex"/>
+ </module-def>
+
++ <module-def name="org.jboss.jts">
++ <maven-resource group="org.jboss.jbossts" artifact="jbossjta"/>
++ </module-def>
++
++ <module-def name="org.jboss.jts.integration">
++ <maven-resource group="org.jboss.jbossts" artifact="jbossjta-integration"/>
++ </module-def>
++
+ <module-def name="org.jboss.marshalling">
+ <maven-resource group="org.jboss.marshalling" artifact="jboss-marshalling"/>
+ </module-def>
+@@ -965,14 +973,6 @@
+ <maven-resource group="jboss.jaxbintros" artifact="jboss-jaxb-intros"/>
+ </module-def>
+
+- <module-def name="org.jboss.jts">
+- <maven-resource group="org.jboss.jbossts" artifact="jbossjta"/>
+- </module-def>
+-
+- <module-def name="org.jboss.jts.integration">
+- <maven-resource group="org.jboss.jbossts" artifact="jbossjta-integration"/>
+- </module-def>
+-
+ <module-def name="org.jboss.netty">
+ <maven-resource group="org.jboss.netty" artifact="netty"/>
+ </module-def>
+diff --git a/build/pom.xml b/build/pom.xml
+index 9d6e680..095f273 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -179,6 +179,16 @@
+ </dependency>
+
+ <dependency>
++ <groupId>org.jboss.jbossts</groupId>
++ <artifactId>jbossjta</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.jbossts</groupId>
++ <artifactId>jbossjta-integration</artifactId>
++ </dependency>
++
++ <dependency>
+ <groupId>org.jboss.invocation</groupId>
+ <artifactId>jboss-invocation</artifactId>
+ </dependency>
+@@ -1142,16 +1152,6 @@
+
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+- <artifactId>jbossjta</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.jbossts</groupId>
+- <artifactId>jbossjta-integration</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.jbossts</groupId>
+ <artifactId>jbosstxbridge</artifactId>
+ </dependency>
+
+--
+1.7.10
+
diff --git a/0021-adding-org.omg.api-to-minimal-build.patch b/0016-adding-org.omg.api-to-minimal-build.patch
similarity index 55%
rename from 0021-adding-org.omg.api-to-minimal-build.patch
rename to 0016-adding-org.omg.api-to-minimal-build.patch
index 5a0988f..3b0c856 100644
--- a/0021-adding-org.omg.api-to-minimal-build.patch
+++ b/0016-adding-org.omg.api-to-minimal-build.patch
@@ -1,17 +1,17 @@
-From ff6bfa735cc69d00d27787219c9b6bde6a53302b Mon Sep 17 00:00:00 2001
+From ea60ddbc903738ef17f973368d81461da1bf76ca Mon Sep 17 00:00:00 2001
From: Oved Ourfali <ovedo at redhat.com>
Date: Tue, 21 Feb 2012 11:01:21 +0200
-Subject: [PATCH 3/3] adding org.omg.api to minimal build
+Subject: [PATCH 16/43] adding org.omg.api to minimal build
---
- build/build.xml | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ build/build.xml | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/build/build.xml b/build/build.xml
-index c8a94a5..7747acb 100644
+index d556b42..7479348 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -344,6 +344,8 @@
+@@ -352,6 +352,8 @@
<maven-resource group="org.jboss.xnio" artifact="xnio-nio"/>
</module-def>
@@ -20,15 +20,17 @@ index c8a94a5..7747acb 100644
</target>
<target name="modules" depends="modules-minimalistic">
-@@ -1134,8 +1136,6 @@
- <maven-resource group="junit" artifact="junit"/>
+@@ -1147,7 +1149,9 @@
+ <maven-resource group="joda-time" artifact="joda-time"/>
</module-def>
- <module-def name="org.omg.api" />
--
++ <module-def name="org.junit">
++ <maven-resource group="junit" artifact="junit"/>
++ </module-def>
+
<module-def name="org.osgi.core">
<maven-resource group="org.osgi" artifact="org.osgi.core"/>
- </module-def>
--
-1.7.9
+1.7.10
diff --git a/0022-Enable-org.jboss.as.security-module.patch b/0017-Enable-org.jboss.as.security-module.patch
similarity index 88%
rename from 0022-Enable-org.jboss.as.security-module.patch
rename to 0017-Enable-org.jboss.as.security-module.patch
index 4d36f67..1f5225b 100644
--- a/0022-Enable-org.jboss.as.security-module.patch
+++ b/0017-Enable-org.jboss.as.security-module.patch
@@ -1,7 +1,7 @@
-From 20dc860453b6329df60ebf7de387bc57da8de0b5 Mon Sep 17 00:00:00 2001
+From 83d35d722226a0f696cbce17d169e6a2e85e08d0 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Mon, 20 Feb 2012 16:51:16 +0100
-Subject: [PATCH 22/24] Enable org.jboss.as.security module
+Subject: [PATCH 17/43] Enable org.jboss.as.security module
---
build/build.xml | 8 ++++----
@@ -10,10 +10,10 @@ Subject: [PATCH 22/24] Enable org.jboss.as.security module
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 7747acb..7279add 100644
+index 7479348..9263fb2 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -213,6 +213,10 @@
+@@ -217,6 +217,10 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-remoting"/>
</module-def>
@@ -24,7 +24,7 @@ index 7747acb..7279add 100644
<module-def name="org.jboss.as.server">
<maven-resource group="org.jboss.as" artifact="jboss-as-server"/>
</module-def>
-@@ -885,10 +889,6 @@
+@@ -899,10 +903,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-sar"/>
</module-def>
@@ -36,10 +36,10 @@ index 7747acb..7279add 100644
<maven-resource group="org.jboss.as" artifact="jboss-as-web"/>
<maven-resource group="org.jboss.web" artifact="jasper-jdt"/>
diff --git a/build/pom.xml b/build/pom.xml
-index d8ad535..5922925 100644
+index 095f273..02ac14c 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -136,6 +136,11 @@
+@@ -170,6 +170,11 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -51,7 +51,7 @@ index d8ad535..5922925 100644
<artifactId>jboss-as-transactions</artifactId>
</dependency>
-@@ -956,11 +961,6 @@
+@@ -1010,11 +1015,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -64,10 +64,10 @@ index d8ad535..5922925 100644
</dependency>
diff --git a/pom.xml b/pom.xml
-index 115fdc6..40bf427 100644
+index 5f816ce..bc3fe79 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -282,6 +282,7 @@
+@@ -289,6 +289,7 @@
<module>process-controller</module>
<module>protocol</module>
<module>remoting</module>
@@ -75,7 +75,7 @@ index 115fdc6..40bf427 100644
<module>server</module>
<module>subsystem-test</module>
<module>threads</module>
-@@ -5941,7 +5942,6 @@
+@@ -5989,7 +5990,6 @@
<module>pojo</module>
<module>remoting-test</module>
<module>sar</module>
@@ -84,5 +84,5 @@ index 115fdc6..40bf427 100644
<module>web</module>
<module>webservices</module>
--
-1.7.9.1
+1.7.10
diff --git a/0023-Enable-part-of-org.jboss.as.clustering-module-infini.patch b/0018-Enable-part-of-org.jboss.as.clustering-module-infini.patch
similarity index 92%
rename from 0023-Enable-part-of-org.jboss.as.clustering-module-infini.patch
rename to 0018-Enable-part-of-org.jboss.as.clustering-module-infini.patch
index a8d57d4..5ea533b 100644
--- a/0023-Enable-part-of-org.jboss.as.clustering-module-infini.patch
+++ b/0018-Enable-part-of-org.jboss.as.clustering-module-infini.patch
@@ -1,7 +1,7 @@
-From 97eb83869cda6aa52cd578d0f5872843af03b07b Mon Sep 17 00:00:00 2001
+From 127354f1d94512417642a0a67f7dddf5e7cadc53 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Mon, 20 Feb 2012 17:59:18 +0100
-Subject: [PATCH 23/24] Enable part of org.jboss.as.clustering module
+Subject: [PATCH 18/43] Enable part of org.jboss.as.clustering module
(infinispan, common, jgroups)
---
@@ -12,10 +12,10 @@ Subject: [PATCH 23/24] Enable part of org.jboss.as.clustering module
4 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 7279add..412fe03 100644
+index 9263fb2..7a4a531 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -149,6 +149,18 @@
+@@ -153,6 +153,18 @@
<maven-resource group="org.hibernate" artifact="hibernate-validator"/>
</module-def>
@@ -34,7 +34,7 @@ index 7279add..412fe03 100644
<module-def name="org.jboss.as.controller">
<maven-resource group="org.jboss.as" artifact="jboss-as-controller"/>
</module-def>
-@@ -740,10 +752,6 @@
+@@ -758,10 +770,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-api"/>
</module-def>
@@ -45,7 +45,7 @@ index 7279add..412fe03 100644
<module-def name="org.jboss.as.clustering.ejb3.infinispan">
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-ejb3-infinispan"/>
</module-def>
-@@ -752,14 +760,6 @@
+@@ -770,14 +778,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-impl"/>
</module-def>
@@ -61,10 +61,10 @@ index 7279add..412fe03 100644
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-registry"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 5922925..e4d9894 100644
+index 02ac14c..69db7ae 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -106,6 +106,21 @@
+@@ -135,6 +135,21 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -86,7 +86,7 @@ index 5922925..e4d9894 100644
<artifactId>jboss-as-domain-http-error-context</artifactId>
</dependency>
-@@ -763,11 +778,6 @@
+@@ -817,11 +832,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -98,7 +98,7 @@ index 5922925..e4d9894 100644
<artifactId>jboss-as-clustering-ejb3-infinispan</artifactId>
</dependency>
-@@ -778,16 +788,6 @@
+@@ -832,16 +842,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -116,7 +116,7 @@ index 5922925..e4d9894 100644
</dependency>
diff --git a/clustering/pom.xml b/clustering/pom.xml
-index dccb39c..4f02d01 100644
+index 71efd3b..6dc97af 100644
--- a/clustering/pom.xml
+++ b/clustering/pom.xml
@@ -38,17 +38,17 @@
@@ -142,10 +142,10 @@ index dccb39c..4f02d01 100644
<dependencies>
diff --git a/pom.xml b/pom.xml
-index 40bf427..3d75c22 100644
+index bc3fe79..25c18fa 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -265,6 +265,7 @@
+@@ -272,6 +272,7 @@
<modules>
<module>build</module>
<module>build-config</module>
@@ -153,14 +153,14 @@ index 40bf427..3d75c22 100644
<module>controller</module>
<module>controller-client</module>
<module>deployment-repository</module>
-@@ -5918,7 +5919,6 @@
+@@ -5966,7 +5967,6 @@
<module>client/ejb</module>
<module>client/jms</module>
<module>client/shade</module>
- <module>clustering</module>
<module>cmp</module>
<module>configadmin</module>
- <module>connector</module>
+ <module>config-assembly</module>
--
-1.7.9.1
+1.7.10
diff --git a/0025-Add-jgroups-module.patch b/0019-Add-jgroups-module.patch
similarity index 81%
rename from 0025-Add-jgroups-module.patch
rename to 0019-Add-jgroups-module.patch
index ff50eef..02bb6f9 100644
--- a/0025-Add-jgroups-module.patch
+++ b/0019-Add-jgroups-module.patch
@@ -1,7 +1,7 @@
-From b17ecc9919cdc9547ab7c69a6b767d87e0e09961 Mon Sep 17 00:00:00 2001
+From e21983724d68ec507f2d462b0a4a4f9f7fae0074 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Wed, 22 Feb 2012 19:29:03 +0100
-Subject: [PATCH 25/25] Add jgroups module
+Subject: [PATCH 19/43] Add jgroups module
---
build/build.xml | 8 ++++----
@@ -9,10 +9,10 @@ Subject: [PATCH 25/25] Add jgroups module
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 412fe03..1bd86ac 100644
+index 7a4a531..36a12c8 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -360,6 +360,10 @@
+@@ -368,6 +368,10 @@
<maven-resource group="org.jboss.xnio" artifact="xnio-nio"/>
</module-def>
@@ -23,7 +23,7 @@ index 412fe03..1bd86ac 100644
<module-def name="org.omg.api" />
</target>
-@@ -1124,10 +1128,6 @@
+@@ -1141,10 +1145,6 @@
<maven-resource group="org.jboss.jbossts" artifact="jbosstxbridge"/>
</module-def>
@@ -35,12 +35,12 @@ index 412fe03..1bd86ac 100644
<maven-resource group="joda-time" artifact="joda-time"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index e4d9894..016f899 100644
+index 69db7ae..5154d26 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -233,6 +233,11 @@
- <groupId>org.jboss.msc</groupId>
- <artifactId>jboss-msc</artifactId>
+@@ -292,6 +292,11 @@
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
</dependency>
+
+ <dependency>
@@ -50,7 +50,7 @@ index e4d9894..016f899 100644
</dependencies>
<profiles>
-@@ -1574,11 +1579,6 @@
+@@ -1578,11 +1583,6 @@
</dependency>
<dependency>
@@ -63,5 +63,5 @@ index e4d9894..016f899 100644
<artifactId>org.osgi.core</artifactId>
</dependency>
--
-1.7.9.1
+1.7.10
diff --git a/0026-Add-infinispan-modules.patch b/0020-Add-infinispan-modules.patch
similarity index 93%
rename from 0026-Add-infinispan-modules.patch
rename to 0020-Add-infinispan-modules.patch
index a253879..8c29914 100644
--- a/0026-Add-infinispan-modules.patch
+++ b/0020-Add-infinispan-modules.patch
@@ -1,7 +1,7 @@
-From e8d5b2615688526c13e7305dd82cae24c973c98d Mon Sep 17 00:00:00 2001
+From 9568d6524d6c988c180532d9fba24b50f5a5b239 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Wed, 22 Feb 2012 19:45:00 +0100
-Subject: [PATCH 26/26] Add infinispan modules
+Subject: [PATCH 20/43] Add infinispan modules
---
build/build.xml | 32 ++++++++++++++++----------------
@@ -9,10 +9,10 @@ Subject: [PATCH 26/26] Add infinispan modules
2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 1bd86ac..edd37d1 100644
+index 36a12c8..ab54783 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -121,6 +121,22 @@
+@@ -125,6 +125,22 @@
~ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-->
@@ -35,7 +35,7 @@ index 1bd86ac..edd37d1 100644
<module-def name="javax.annotation.api">
<maven-resource group="org.jboss.spec.javax.annotation" artifact="jboss-annotations-api_1.1_spec"/>
</module-def>
-@@ -704,22 +720,6 @@
+@@ -722,22 +738,6 @@
<maven-resource group="org.hornetq" artifact="hornetq-ra"/>
</module-def>
@@ -59,10 +59,10 @@ index 1bd86ac..edd37d1 100644
<module-def name="org.jacorb">
<maven-resource group="org.jacorb" artifact="jacorb"/>
diff --git a/build/pom.xml b/build/pom.xml
-index 016f899..aef7142 100644
+index 5154d26..f63f0c1 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -84,6 +84,26 @@
+@@ -108,6 +108,26 @@
<dependencies>
<dependency>
@@ -89,7 +89,7 @@ index 016f899..aef7142 100644
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-@@ -721,26 +741,6 @@
+@@ -770,26 +790,6 @@
</dependency>
<dependency>
@@ -117,5 +117,5 @@ index 016f899..aef7142 100644
<artifactId>javassist</artifactId>
</dependency>
--
-1.7.9.1
+1.7.10
diff --git a/0027-Added-jboss-jacc-api-module.patch b/0021-Added-jboss-jacc-api-module.patch
similarity index 89%
rename from 0027-Added-jboss-jacc-api-module.patch
rename to 0021-Added-jboss-jacc-api-module.patch
index 0d3d6d7..f211495 100644
--- a/0027-Added-jboss-jacc-api-module.patch
+++ b/0021-Added-jboss-jacc-api-module.patch
@@ -1,7 +1,7 @@
-From 59702b189a5317263c6ba8d0d24d604db1df7b0d Mon Sep 17 00:00:00 2001
+From 6eec5ed5e0fe2da02244fd2fa0feb25be1ec933e Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Thu, 23 Feb 2012 13:37:09 +0100
-Subject: [PATCH 27/27] Added jboss-jacc-api module
+Subject: [PATCH 21/43] Added jboss-jacc-api module
---
build/build.xml | 8 ++++----
@@ -9,10 +9,10 @@ Subject: [PATCH 27/27] Added jboss-jacc-api module
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index edd37d1..229032b 100644
+index ab54783..139e28a 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -147,6 +147,10 @@
+@@ -151,6 +151,10 @@
<maven-resource group="org.jboss.spec.javax.interceptor" artifact="jboss-interceptors-api_1.1_spec"/>
</module-def>
@@ -23,7 +23,7 @@ index edd37d1..229032b 100644
<module-def name="javax.transaction.api">
<maven-resource group="org.jboss.spec.javax.transaction" artifact="jboss-transaction-api_1.1_spec"/>
</module-def>
-@@ -504,10 +508,6 @@
+@@ -512,10 +516,6 @@
<maven-resource group="org.jboss.spec.javax.security.auth.message" artifact="jboss-jaspi-api_1.0_spec"/>
</module-def>
@@ -35,10 +35,10 @@ index edd37d1..229032b 100644
<maven-resource group="org.jboss.spec.javax.servlet" artifact="jboss-servlet-api_3.0_spec"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index aef7142..be41dc1 100644
+index f63f0c1..17782c2 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -255,6 +255,11 @@
+@@ -314,6 +314,11 @@
</dependency>
<dependency>
@@ -50,7 +50,7 @@ index aef7142..be41dc1 100644
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
-@@ -1403,11 +1408,6 @@
+@@ -1407,11 +1412,6 @@
</dependency>
<dependency>
@@ -63,5 +63,5 @@ index aef7142..be41dc1 100644
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
--
-1.7.9.1
+1.7.10
diff --git a/0028-Added-javax.servlet.api-module.patch b/0022-Added-javax.servlet.api-module.patch
similarity index 88%
rename from 0028-Added-javax.servlet.api-module.patch
rename to 0022-Added-javax.servlet.api-module.patch
index 938b254..e5bedee 100644
--- a/0028-Added-javax.servlet.api-module.patch
+++ b/0022-Added-javax.servlet.api-module.patch
@@ -1,7 +1,7 @@
-From 1ba6ef44bb7681f4f02b426f4b0f5614f5d9fc64 Mon Sep 17 00:00:00 2001
+From ddc48c9c9bd2b2fa89eb5f11860142ea1a3753a1 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Thu, 23 Feb 2012 14:00:13 +0100
-Subject: [PATCH 28/28] Added javax.servlet.api module
+Subject: [PATCH 22/43] Added javax.servlet.api module
---
build/build.xml | 8 ++++----
@@ -9,10 +9,10 @@ Subject: [PATCH 28/28] Added javax.servlet.api module
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 229032b..a096ce8 100644
+index 139e28a..9553248 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -151,6 +151,10 @@
+@@ -155,6 +155,10 @@
<maven-resource group="org.jboss.spec.javax.security.jacc" artifact="jboss-jacc-api_1.4_spec"/>
</module-def>
@@ -23,7 +23,7 @@ index 229032b..a096ce8 100644
<module-def name="javax.transaction.api">
<maven-resource group="org.jboss.spec.javax.transaction" artifact="jboss-transaction-api_1.1_spec"/>
</module-def>
-@@ -508,10 +512,6 @@
+@@ -516,10 +520,6 @@
<maven-resource group="org.jboss.spec.javax.security.auth.message" artifact="jboss-jaspi-api_1.0_spec"/>
</module-def>
@@ -35,10 +35,10 @@ index 229032b..a096ce8 100644
<maven-resource group="org.jboss.spec.javax.servlet.jsp" artifact="jboss-jsp-api_2.2_spec"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index be41dc1..ebd5682 100644
+index 17782c2..55c96d8 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -260,6 +260,11 @@
+@@ -319,6 +319,11 @@
</dependency>
<dependency>
@@ -50,7 +50,7 @@ index be41dc1..ebd5682 100644
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
-@@ -1408,11 +1413,6 @@
+@@ -1412,11 +1417,6 @@
</dependency>
<dependency>
@@ -63,5 +63,5 @@ index be41dc1..ebd5682 100644
<artifactId>jboss-jsp-api_2.2_spec</artifactId>
</dependency>
--
-1.7.9.1
+1.7.10
diff --git a/0029-Added-org.jboss.security.negotiation-module.patch b/0023-Added-org.jboss.security.negotiation-module.patch
similarity index 93%
rename from 0029-Added-org.jboss.security.negotiation-module.patch
rename to 0023-Added-org.jboss.security.negotiation-module.patch
index 0ac4dd9..b0ba187 100644
--- a/0029-Added-org.jboss.security.negotiation-module.patch
+++ b/0023-Added-org.jboss.security.negotiation-module.patch
@@ -1,7 +1,7 @@
-From a384370086834a3382d2109a99e5503a1442bd72 Mon Sep 17 00:00:00 2001
+From 61d66078a0503f474cf1e580ad122a36906cf020 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Thu, 23 Feb 2012 14:34:28 +0100
-Subject: [PATCH 29/29] Added org.jboss.security.negotiation module
+Subject: [PATCH 23/43] Added org.jboss.security.negotiation module
---
build/build.xml | 16 ++++++++--------
@@ -9,10 +9,10 @@ Subject: [PATCH 29/29] Added org.jboss.security.negotiation module
2 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index a096ce8..13aaeb0 100644
+index 9553248..d8427fc 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -360,6 +360,14 @@
+@@ -368,6 +368,14 @@
<maven-resource group="org.jboss.sasl" artifact="jboss-sasl" />
</module-def>
@@ -27,7 +27,7 @@ index a096ce8..13aaeb0 100644
<module-def name="org.jboss.staxmapper">
<maven-resource group="org.jboss" artifact="staxmapper"/>
</module-def>
-@@ -1029,14 +1037,6 @@
+@@ -1046,14 +1054,6 @@
<maven-resource group="org.jboss.resteasy" artifact="resteasy-yaml-provider" jandex="true"/>
</module-def>
@@ -43,10 +43,10 @@ index a096ce8..13aaeb0 100644
<maven-resource group="org.jboss.security" artifact="jbossxacml"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index ebd5682..c772bae 100644
+index 55c96d8..934782f 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -171,6 +171,11 @@
+@@ -205,6 +205,11 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -58,7 +58,7 @@ index ebd5682..c772bae 100644
<artifactId>jboss-as-security</artifactId>
</dependency>
-@@ -245,8 +250,28 @@
+@@ -294,8 +299,28 @@
</dependency>
<dependency>
@@ -89,7 +89,7 @@ index ebd5682..c772bae 100644
</dependency>
<dependency>
-@@ -1307,30 +1332,6 @@
+@@ -1311,30 +1336,6 @@
<artifactId>jboss-seam-int-jbossas</artifactId>
</dependency>
@@ -121,5 +121,5 @@ index ebd5682..c772bae 100644
<dependency>
<groupId>org.jboss.security</groupId>
--
-1.7.9.1
+1.7.10
diff --git a/0030-Added-org.picketbox-module.patch b/0024-Added-org.picketbox-module.patch
similarity index 90%
rename from 0030-Added-org.picketbox-module.patch
rename to 0024-Added-org.picketbox-module.patch
index 38835b6..429d48d 100644
--- a/0030-Added-org.picketbox-module.patch
+++ b/0024-Added-org.picketbox-module.patch
@@ -1,7 +1,7 @@
-From 721824399a6e9b90a1c5a2a7b1c676da25699d4a Mon Sep 17 00:00:00 2001
+From b14f5e1ef0a720dc6ec11a39b6149e22b60560fa Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Thu, 23 Feb 2012 15:33:39 +0100
-Subject: [PATCH 30/30] Added org.picketbox module
+Subject: [PATCH 24/43] Added org.picketbox module
---
build/build.xml | 12 ++++++------
@@ -9,10 +9,10 @@ Subject: [PATCH 30/30] Added org.picketbox module
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 13aaeb0..3e219a9 100644
+index d8427fc..daa0c46 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -398,6 +398,12 @@
+@@ -406,6 +406,12 @@
<module-def name="org.omg.api" />
@@ -25,8 +25,8 @@ index 13aaeb0..3e219a9 100644
</target>
<target name="modules" depends="modules-minimalistic">
-@@ -1147,12 +1153,6 @@
- <maven-resource group="org.picketlink" artifact="picketlink-trust-jbossws"/>
+@@ -1163,12 +1169,6 @@
+ <maven-resource group="org.picketlink" artifact="picketlink-bindings-jboss"/>
</module-def>
- <module-def name="org.picketbox">
@@ -39,10 +39,10 @@ index 13aaeb0..3e219a9 100644
<maven-resource group="org.python" artifact="jython-standalone"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index c772bae..1591537 100644
+index 934782f..2addb10 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -293,6 +293,21 @@
+@@ -352,6 +352,21 @@
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
@@ -64,7 +64,7 @@ index c772bae..1591537 100644
</dependencies>
<profiles>
-@@ -1620,21 +1635,6 @@
+@@ -1619,21 +1634,6 @@
</dependency>
<dependency>
@@ -87,5 +87,5 @@ index c772bae..1591537 100644
<artifactId>jython-standalone</artifactId>
</dependency>
--
-1.7.9.1
+1.7.10
diff --git a/0031-Added-sun.jdk-module.patch b/0025-Added-sun.jdk-module.patch
similarity index 71%
rename from 0031-Added-sun.jdk-module.patch
rename to 0025-Added-sun.jdk-module.patch
index a3885f2..ab3623f 100644
--- a/0031-Added-sun.jdk-module.patch
+++ b/0025-Added-sun.jdk-module.patch
@@ -1,17 +1,17 @@
-From 3a056a7a97d478d0f8286cd9a0e10a98a5531b59 Mon Sep 17 00:00:00 2001
+From 031b70a4b2a8a23f377542faf0fc70b1cb327613 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Thu, 23 Feb 2012 16:26:14 +0100
-Subject: [PATCH 31/31] Added sun.jdk module
+Subject: [PATCH 25/43] Added sun.jdk module
---
build/build.xml | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 3e219a9..3d903d7 100644
+index daa0c46..8043422 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -404,6 +404,7 @@
+@@ -412,6 +412,7 @@
<maven-resource group="org.picketbox" artifact="picketbox-commons"/>
</module-def>
@@ -19,7 +19,7 @@ index 3e219a9..3d903d7 100644
</target>
<target name="modules" depends="modules-minimalistic">
-@@ -1193,8 +1194,6 @@
+@@ -1209,8 +1210,6 @@
<maven-resource group="xom" artifact="xom"/>
</module-def>
@@ -29,5 +29,5 @@ index 3e219a9..3d903d7 100644
<target name="bundles">
--
-1.7.9.1
+1.7.10
diff --git a/0032-Added-jboss-as-connector-AS7-module.patch b/0026-Added-jboss-as-connector-AS7-module.patch
similarity index 85%
copy from 0032-Added-jboss-as-connector-AS7-module.patch
copy to 0026-Added-jboss-as-connector-AS7-module.patch
index a959f75..1161ac0 100644
--- a/0032-Added-jboss-as-connector-AS7-module.patch
+++ b/0026-Added-jboss-as-connector-AS7-module.patch
@@ -1,7 +1,7 @@
-From 1feb0f48ce2bef66da5ab000a9b1b6090d7a4d90 Mon Sep 17 00:00:00 2001
+From 03963626c57209cfdcdb4d9ad13ffc1f3dc0d278 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Fri, 24 Feb 2012 15:00:04 +0100
-Subject: [PATCH 32/32] Added jboss-as-connector AS7 module
+Subject: [PATCH 26/43] Added jboss-as-connector AS7 module
---
build/build.xml | 8 ++++----
@@ -10,10 +10,10 @@ Subject: [PATCH 32/32] Added jboss-as-connector AS7 module
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 3d903d7..ff67e72 100644
+index 8043422..69b27c8 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -185,6 +185,10 @@
+@@ -189,6 +189,10 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-jgroups"/>
</module-def>
@@ -24,7 +24,7 @@ index 3d903d7..ff67e72 100644
<module-def name="org.jboss.as.controller">
<maven-resource group="org.jboss.as" artifact="jboss-as-controller"/>
</module-def>
-@@ -807,10 +811,6 @@
+@@ -825,10 +829,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-cmp"/>
</module-def>
@@ -36,10 +36,10 @@ index 3d903d7..ff67e72 100644
<maven-resource group="org.jboss.as" artifact="jboss-as-deployment-scanner"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 1591537..3249ef0 100644
+index 2addb10..bfcaaf8 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -141,6 +141,11 @@
+@@ -170,6 +170,11 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -51,7 +51,7 @@ index 1591537..3249ef0 100644
<artifactId>jboss-as-domain-http-error-context</artifactId>
</dependency>
-@@ -884,11 +889,6 @@
+@@ -938,11 +943,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -64,10 +64,10 @@ index 1591537..3249ef0 100644
</dependency>
diff --git a/pom.xml b/pom.xml
-index f9537bc..861ec88 100644
+index 25c18fa..3e72680 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -266,6 +266,7 @@
+@@ -273,6 +273,7 @@
<module>build</module>
<module>build-config</module>
<module>clustering</module>
@@ -75,14 +75,14 @@ index f9537bc..861ec88 100644
<module>controller</module>
<module>controller-client</module>
<module>deployment-repository</module>
-@@ -5921,7 +5922,6 @@
- <module>client/shade</module>
+@@ -5970,7 +5971,6 @@
<module>cmp</module>
<module>configadmin</module>
+ <module>config-assembly</module>
- <module>connector</module>
- <module>demos</module>
<module>deployment-scanner</module>
<module>dist</module>
+ <module>ejb3</module>
--
-1.7.9.1
+1.7.10
diff --git a/0033-Added-jboss-as-web-jboss-as-clustering-api-jboss-as-.patch b/0027-Added-jboss-as-web-jboss-as-clustering-api-jboss-as-.patch
similarity index 92%
rename from 0033-Added-jboss-as-web-jboss-as-clustering-api-jboss-as-.patch
rename to 0027-Added-jboss-as-web-jboss-as-clustering-api-jboss-as-.patch
index b199e37..9e7c742 100644
--- a/0033-Added-jboss-as-web-jboss-as-clustering-api-jboss-as-.patch
+++ b/0027-Added-jboss-as-web-jboss-as-clustering-api-jboss-as-.patch
@@ -1,7 +1,7 @@
-From e35b5fb43cf2e27ff4db88e74d5aefb4d6539fbd Mon Sep 17 00:00:00 2001
+From a8c7efdca2b4f95cdfa749efa204ea021fcab860 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Mon, 27 Feb 2012 15:11:20 +0100
-Subject: [PATCH 33/33] Added jboss-as-web, jboss-as-clustering-api,
+Subject: [PATCH 27/43] Added jboss-as-web, jboss-as-clustering-api,
jboss-as-clustering-web-spi modules. Removed
jboss-jdt dependency.
@@ -14,10 +14,10 @@ Subject: [PATCH 33/33] Added jboss-as-web, jboss-as-clustering-api,
5 files changed, 33 insertions(+), 39 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index ff67e72..cfc9ebb 100644
+index 69b27c8..cf0b579 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -173,6 +173,10 @@
+@@ -177,6 +177,10 @@
<maven-resource group="org.hibernate" artifact="hibernate-validator"/>
</module-def>
@@ -28,7 +28,7 @@ index ff67e72..cfc9ebb 100644
<module-def name="org.jboss.as.clustering.common">
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-common"/>
</module-def>
-@@ -185,6 +189,10 @@
+@@ -189,6 +193,10 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-jgroups"/>
</module-def>
@@ -39,7 +39,7 @@ index ff67e72..cfc9ebb 100644
<module-def name="org.jboss.as.connector">
<maven-resource group="org.jboss.as" artifact="jboss-as-connector"/>
</module-def>
-@@ -271,6 +279,12 @@
+@@ -275,6 +283,12 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-transactions"/>
</module-def>
@@ -52,7 +52,7 @@ index ff67e72..cfc9ebb 100644
<module-def name="org.jboss.com.sun.httpserver">
<maven-resource group="org.jboss.com.sun.httpserver" artifact="httpserver"/>
</module-def>
-@@ -771,10 +785,6 @@
+@@ -789,10 +803,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-cli"/>
</module-def>
@@ -63,7 +63,7 @@ index ff67e72..cfc9ebb 100644
<module-def name="org.jboss.as.clustering.ejb3.infinispan">
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-ejb3-infinispan"/>
</module-def>
-@@ -799,10 +809,6 @@
+@@ -817,10 +827,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-web-infinispan"/>
</module-def>
@@ -74,7 +74,7 @@ index ff67e72..cfc9ebb 100644
<module-def name="org.jboss.as.configadmin">
<maven-resource group="org.jboss.as" artifact="jboss-as-configadmin"/>
</module-def>
-@@ -908,13 +914,6 @@
+@@ -922,13 +928,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-sar"/>
</module-def>
@@ -87,12 +87,12 @@ index ff67e72..cfc9ebb 100644
-
<module-def name="org.jboss.as.webservices">
<maven-resource group="org.jboss.as" artifact="jboss-as-webservices-server-integration"/>
- <maven-resource-with-classifier group="org.jboss.ws.cxf" artifact="jbossws-cxf-resources" classifier="jboss700"/>
+ <maven-resource-with-classifier group="org.jboss.ws.cxf" artifact="jbossws-cxf-resources" classifier="jboss711"/>
diff --git a/build/pom.xml b/build/pom.xml
-index 3249ef0..0f8b843 100644
+index bfcaaf8..c4fd4ce 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -141,6 +141,16 @@
+@@ -170,6 +170,16 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -109,7 +109,7 @@ index 3249ef0..0f8b843 100644
<artifactId>jboss-as-connector</artifactId>
</dependency>
-@@ -190,6 +200,11 @@
+@@ -224,6 +234,11 @@
</dependency>
<dependency>
@@ -121,7 +121,7 @@ index 3249ef0..0f8b843 100644
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
</dependency>
-@@ -833,11 +848,6 @@
+@@ -887,11 +902,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -133,7 +133,7 @@ index 3249ef0..0f8b843 100644
<artifactId>jboss-as-clustering-ejb3-infinispan</artifactId>
</dependency>
-@@ -867,11 +877,6 @@
+@@ -921,11 +931,6 @@
</dependency>
<dependency>
@@ -145,7 +145,7 @@ index 3249ef0..0f8b843 100644
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-cmp</artifactId>
</dependency>
-@@ -1031,11 +1036,6 @@
+@@ -1085,11 +1090,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -158,7 +158,7 @@ index 3249ef0..0f8b843 100644
</dependency>
diff --git a/clustering/pom.xml b/clustering/pom.xml
-index 4f02d01..f1f9014 100644
+index 6dc97af..521cfa1 100644
--- a/clustering/pom.xml
+++ b/clustering/pom.xml
@@ -38,16 +38,16 @@
@@ -182,10 +182,10 @@ index 4f02d01..f1f9014 100644
</modules>
diff --git a/pom.xml b/pom.xml
-index 861ec88..ed64a5a 100644
+index 3e72680..6ff1369 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -289,6 +289,7 @@
+@@ -296,6 +296,7 @@
<module>subsystem-test</module>
<module>threads</module>
<module>transactions</module>
@@ -193,7 +193,7 @@ index 861ec88..ed64a5a 100644
</modules>
<build>
-@@ -5943,7 +5944,6 @@
+@@ -5991,7 +5992,6 @@
<module>remoting-test</module>
<module>sar</module>
<module>spec-api</module>
@@ -202,7 +202,7 @@ index 861ec88..ed64a5a 100644
<module>weld</module>
<!--
diff --git a/web/pom.xml b/web/pom.xml
-index 49def4e..fae1fb1 100644
+index d336f0d..aa846cd 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -145,11 +145,6 @@
@@ -218,5 +218,5 @@ index 49def4e..fae1fb1 100644
</dependency>
--
-1.7.9.1
+1.7.10
diff --git a/0034-Added-net.jcip-org.jboss.ironjacamar-javax.resource..patch b/0028-Added-net.jcip-org.jboss.ironjacamar-javax.resource..patch
similarity index 92%
rename from 0034-Added-net.jcip-org.jboss.ironjacamar-javax.resource..patch
rename to 0028-Added-net.jcip-org.jboss.ironjacamar-javax.resource..patch
index 382da67..d8cb4fb 100644
--- a/0034-Added-net.jcip-org.jboss.ironjacamar-javax.resource..patch
+++ b/0028-Added-net.jcip-org.jboss.ironjacamar-javax.resource..patch
@@ -1,23 +1,22 @@
-From 88d941aff526f2b28505c7372de768fb44081d82 Mon Sep 17 00:00:00 2001
+From 5954a5690d566d4f6a264a74b7ea44d4ea496862 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Thu, 1 Mar 2012 19:16:29 +0100
-Subject: [PATCH 34/35] Added net.jcip, org.jboss.ironjacamar,
+Subject: [PATCH 28/43] Added net.jcip, org.jboss.ironjacamar,
javax.resource.api, org.jboss.as.deployment-scanner,
com.sun.jsf-impl and many others modules
---
- build/build.xml | 246 +++++++++---------
+ build/build.xml | 246 ++++++++---------
build/pom.xml | 290 ++++++++++----------
.../modules/javax/xml/soap/api/main/module.xml | 1 -
- .../jboss/as/clustering/infinispan/main/module.xml | 2 +-
pom.xml | 2 +-
- 5 files changed, 270 insertions(+), 271 deletions(-)
+ 4 files changed, 274 insertions(+), 265 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index cfc9ebb..b31ba53 100644
+index cf0b579..56ab4c6 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -121,6 +121,22 @@
+@@ -125,6 +125,22 @@
~ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-->
@@ -40,7 +39,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="org.infinispan">
<maven-resource group="org.infinispan" artifact="infinispan-core"/>
</module-def>
-@@ -137,16 +153,56 @@
+@@ -141,16 +157,56 @@
<maven-resource group="org.infinispan" artifact="infinispan-client-hotrod" />
</module-def>
@@ -97,7 +96,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="javax.security.jacc.api">
<maven-resource group="org.jboss.spec.javax.security.jacc" artifact="jboss-jacc-api_1.4_spec"/>
</module-def>
-@@ -155,24 +211,70 @@
+@@ -159,24 +215,70 @@
<maven-resource group="org.jboss.spec.javax.servlet" artifact="jboss-servlet-api_3.0_spec"/>
</module-def>
@@ -168,7 +167,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="org.jboss.as.clustering.api">
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-api"/>
</module-def>
-@@ -209,6 +311,10 @@
+@@ -213,6 +315,10 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-deployment-repository"/>
</module-def>
@@ -179,7 +178,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="org.jboss.as.domain-http-error-context">
<maven-resource group="org.jboss.as" artifact="jboss-as-domain-http-error-context"/>
</module-def>
-@@ -281,7 +387,7 @@
+@@ -285,7 +391,7 @@
<module-def name="org.jboss.as.web">
<maven-resource group="org.jboss.as" artifact="jboss-as-web"/>
@@ -188,7 +187,7 @@ index cfc9ebb..b31ba53 100644
<maven-resource group="org.jboss.web" artifact="jbossweb"/>
</module-def>
-@@ -414,6 +520,10 @@
+@@ -422,6 +528,10 @@
<maven-resource group="org.jgroups" artifact="jgroups"/>
</module-def>
@@ -199,7 +198,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="org.omg.api" />
<module-def name="org.picketbox">
-@@ -422,6 +532,18 @@
+@@ -430,6 +540,18 @@
<maven-resource group="org.picketbox" artifact="picketbox-commons"/>
</module-def>
@@ -218,7 +217,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="sun.jdk"/>
</target>
-@@ -454,10 +576,6 @@
+@@ -462,10 +584,6 @@
<maven-resource group="com.h2database" artifact="h2"/>
</module-def>
@@ -229,7 +228,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="com.sun.jsf-impl" slot="1.2">
<maven-resource group="javax.faces" artifact="jsf-impl"/>
</module-def>
-@@ -479,44 +597,14 @@
+@@ -487,44 +605,14 @@
<maven-resource group="gnu-getopt" artifact="getopt" />
</module-def>
@@ -274,7 +273,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="javax.jws.api">
<maven-resource group="javax.jws" artifact="jsr181-api"/>
</module-def>
-@@ -525,56 +613,20 @@
+@@ -533,56 +621,20 @@
<maven-resource group="org.jboss.spec.javax.management.j2ee" artifact="jboss-j2eemgmt-api_1.1_spec"/>
</module-def>
@@ -331,7 +330,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="javax.xml.ws.api">
<maven-resource group="org.jboss.spec.javax.xml.ws" artifact="jboss-jaxws-api_2.2_spec"/>
</module-def>
-@@ -583,10 +635,6 @@
+@@ -591,10 +643,6 @@
<maven-resource group="jline" artifact="jline"/>
</module-def>
@@ -342,7 +341,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="net.sourceforge.cssparser">
<maven-resource group="net.sourceforge.cssparser" artifact="cssparser"/>
</module-def>
-@@ -619,8 +667,6 @@
+@@ -631,8 +679,6 @@
<maven-resource group="commons-lang" artifact="commons-lang"/>
</module-def>
@@ -351,8 +350,8 @@ index cfc9ebb..b31ba53 100644
<module-def name="org.apache.commons.pool">
<maven-resource group="commons-pool" artifact="commons-pool"/>
</module-def>
-@@ -685,15 +731,6 @@
- <maven-resource group="org.apache.ws.scout" artifact="scout"/>
+@@ -705,15 +751,6 @@
+ <maven-resource group="org.apache.juddi.scout" artifact="scout"/>
</module-def>
- <module-def name="org.apache.xalan">
@@ -367,7 +366,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="org.apache.xml-resolver">
<maven-resource group="xml-resolver" artifact="xml-resolver"/>
</module-def>
-@@ -817,10 +854,6 @@
+@@ -835,10 +872,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-cmp"/>
</module-def>
@@ -378,7 +377,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="org.jboss.as.domain-add-user" />
<module-def name="org.jboss.as.ejb3">
-@@ -958,23 +991,6 @@
+@@ -972,23 +1005,6 @@
<maven-resource group="org.jboss.interceptor" artifact="jboss-interceptor-spi"/>
</module-def>
@@ -402,7 +401,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="org.jboss.jaxbintros">
<maven-resource group="jboss.jaxbintros" artifact="jboss-jaxb-intros"/>
</module-def>
-@@ -1134,10 +1150,6 @@
+@@ -1151,10 +1167,6 @@
<maven-resource group="org.jboss.jbossts" artifact="jbosstxbridge"/>
</module-def>
@@ -413,7 +412,7 @@ index cfc9ebb..b31ba53 100644
<module-def name="org.junit">
<maven-resource group="junit" artifact="junit"/>
</module-def>
-@@ -1157,22 +1169,10 @@
+@@ -1173,22 +1185,10 @@
<maven-resource group="org.python" artifact="jython-standalone"/>
</module-def>
@@ -437,10 +436,10 @@ index cfc9ebb..b31ba53 100644
<maven-resource group="org.slf4j" artifact="slf4j-ext"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 0f8b843..6451832 100644
+index c4fd4ce..74aaf52 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -84,6 +84,31 @@
+@@ -108,6 +108,31 @@
<dependencies>
<dependency>
@@ -472,8 +471,8 @@ index 0f8b843..6451832 100644
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-jdbc</artifactId>
</dependency>
-@@ -108,6 +133,11 @@
- <artifactId>log4j</artifactId>
+@@ -137,6 +162,11 @@
+ <artifactId>hibernate-validator</artifactId>
</dependency>
+ <dependency>
@@ -484,7 +483,7 @@ index 0f8b843..6451832 100644
<!-- TODO: why do we need jandex in minimal? -->
<dependency>
<groupId>org.jboss</groupId>
-@@ -156,6 +186,16 @@
+@@ -185,6 +215,16 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -501,7 +500,7 @@ index 0f8b843..6451832 100644
<artifactId>jboss-as-domain-http-error-context</artifactId>
</dependency>
-@@ -310,6 +350,76 @@
+@@ -369,6 +409,76 @@
</dependency>
<dependency>
@@ -578,7 +577,7 @@ index 0f8b843..6451832 100644
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
-@@ -328,6 +438,41 @@
+@@ -387,6 +497,41 @@
<groupId>org.picketbox</groupId>
<artifactId>picketbox-infinispan</artifactId>
</dependency>
@@ -620,7 +619,7 @@ index 0f8b843..6451832 100644
</dependencies>
<profiles>
-@@ -364,11 +509,6 @@
+@@ -423,11 +568,6 @@
</dependency>
<dependency>
@@ -632,7 +631,7 @@ index 0f8b843..6451832 100644
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
-@@ -441,11 +581,6 @@
+@@ -500,11 +640,6 @@
</dependency>
<dependency>
@@ -644,7 +643,7 @@ index 0f8b843..6451832 100644
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
</dependency>
-@@ -456,21 +591,11 @@
+@@ -515,21 +650,11 @@
</dependency>
<dependency>
@@ -666,19 +665,19 @@ index 0f8b843..6451832 100644
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
-@@ -491,11 +616,6 @@
+@@ -555,6 +680,11 @@
</dependency>
<dependency>
-- <groupId>joda-time</groupId>
-- <artifactId>joda-time</artifactId>
-- </dependency>
--
-- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
++ <groupId>junit</groupId>
++ <artifactId>junit</artifactId>
++ </dependency>
++
++ <dependency>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
</dependency>
-@@ -791,11 +911,6 @@
+@@ -840,11 +970,6 @@
</dependency>
<dependency>
@@ -690,7 +689,7 @@ index 0f8b843..6451832 100644
<groupId>org.hornetq</groupId>
<artifactId>hornetq-core</artifactId>
</dependency>
-@@ -914,16 +1029,6 @@
+@@ -968,16 +1093,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -707,7 +706,7 @@ index 0f8b843..6451832 100644
<artifactId>jboss-as-ejb3</artifactId>
</dependency>
-@@ -1369,46 +1474,6 @@
+@@ -1373,46 +1488,6 @@
</dependency>
<dependency>
@@ -754,7 +753,7 @@ index 0f8b843..6451832 100644
<groupId>org.jboss.spec.javax.management.j2ee</groupId>
<artifactId>jboss-j2eemgmt-api_1.1_spec</artifactId>
</dependency>
-@@ -1424,51 +1489,16 @@
+@@ -1428,51 +1503,16 @@
</dependency>
<dependency>
@@ -806,7 +805,7 @@ index 0f8b843..6451832 100644
<groupId>org.jboss.spec.javax.xml.ws</groupId>
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
</dependency>
-@@ -1485,11 +1515,6 @@
+@@ -1489,11 +1529,6 @@
<dependency>
<groupId>org.jboss.web</groupId>
@@ -818,7 +817,7 @@ index 0f8b843..6451832 100644
<artifactId>jbossweb</artifactId>
</dependency>
-@@ -1641,16 +1666,6 @@
+@@ -1640,16 +1675,6 @@
<dependency>
<groupId>org.slf4j</groupId>
@@ -835,7 +834,7 @@ index 0f8b843..6451832 100644
<artifactId>slf4j-ext</artifactId>
</dependency>
-@@ -1670,21 +1685,6 @@
+@@ -1669,21 +1694,6 @@
</dependency>
<dependency>
@@ -869,24 +868,11 @@ index f65c518..20c547c 100644
<module name="javax.api"/>
<module name="org.jboss.modules"/>
</dependencies>
-diff --git a/build/src/main/resources/modules/org/jboss/as/clustering/infinispan/main/module.xml b/build/src/main/resources/modules/org/jboss/as/clustering/infinispan/main/module.xml
-index d474593..a6a2b00 100644
---- a/build/src/main/resources/modules/org/jboss/as/clustering/infinispan/main/module.xml
-+++ b/build/src/main/resources/modules/org/jboss/as/clustering/infinispan/main/module.xml
-@@ -35,7 +35,7 @@
- <module name="javax.api"/>
- <module name="javax.transaction.api"/>
- <module name="net.jcip"/>
-- <module name="org.hibernate.infinispan" services="import"/> <!-- AS7-3290 Infinispan needs to see the 'Hibernate Infinispan' services -->
-+ <!-- <module name="org.hibernate.infinispan" services="import"/> temporary disabled --> <!-- AS7-3290 Infinispan needs to see the 'Hibernate Infinispan' services -->
- <module name="org.infinispan"/>
- <module name="org.infinispan.cachestore.jdbc"/>
- <module name="org.infinispan.cachestore.remote" />
diff --git a/pom.xml b/pom.xml
-index ed64a5a..a724747 100644
+index 6ff1369..8a22682 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -270,6 +270,7 @@
+@@ -277,6 +277,7 @@
<module>controller</module>
<module>controller-client</module>
<module>deployment-repository</module>
@@ -894,14 +880,14 @@ index ed64a5a..a724747 100644
<module>domain-http</module>
<module>domain-management</module>
<module>ee</module>
-@@ -5924,7 +5925,6 @@
+@@ -5972,7 +5973,6 @@
<module>cmp</module>
<module>configadmin</module>
- <module>demos</module>
+ <module>config-assembly</module>
- <module>deployment-scanner</module>
<module>dist</module>
<module>ejb3</module>
<module>host-controller</module>
--
-1.7.9.1
+1.7.10
diff --git a/0035-Make-some-modules-optional.patch b/0029-Make-some-modules-optional.patch
similarity index 92%
rename from 0035-Make-some-modules-optional.patch
rename to 0029-Make-some-modules-optional.patch
index 1e7c437..6c399ce 100644
--- a/0035-Make-some-modules-optional.patch
+++ b/0029-Make-some-modules-optional.patch
@@ -1,15 +1,15 @@
-From 044e195c1edd666990e34de971c848c8406671fa Mon Sep 17 00:00:00 2001
+From 71c3ac3378087f9513159ac18221b3c19bf7e96c Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Tue, 6 Mar 2012 14:03:25 +0100
-Subject: [PATCH 35/35] Make some modules optional
+Subject: [PATCH 29/43] Make some modules optional
---
- .../resources/modules/javaee/api/main/module.xml | 16 ++++++++--------
- .../modules/javax/ejb/api/main/module.xml | 2 +-
- .../modules/javax/mail/api/main/module.xml | 2 +-
- .../modules/javax/xml/bind/api/main/module.xml | 2 +-
- .../modules/org/jboss/jts/main/module.xml | 2 +-
- .../modules/org/jboss/metadata/main/module.xml | 4 ++--
+ .../main/resources/modules/javaee/api/main/module.xml | 16 ++++++++--------
+ .../resources/modules/javax/ejb/api/main/module.xml | 2 +-
+ .../resources/modules/javax/mail/api/main/module.xml | 2 +-
+ .../modules/javax/xml/bind/api/main/module.xml | 2 +-
+ .../resources/modules/org/jboss/jts/main/module.xml | 2 +-
+ .../modules/org/jboss/metadata/main/module.xml | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/build/src/main/resources/modules/javaee/api/main/module.xml b/build/src/main/resources/modules/javaee/api/main/module.xml
@@ -129,5 +129,5 @@ index 4d41ac8..871d6ff 100644
<module name="org.jboss.staxmapper"/>
<module name="org.jboss.logging"/>
--
-1.7.9.1
+1.7.10
diff --git a/0036-Added-jboss-as-ejb3-jboss-as-weld-jboss-as-jpa-modul.patch b/0030-Added-jboss-as-ejb3-jboss-as-weld-jboss-as-jpa-modul.patch
similarity index 86%
rename from 0036-Added-jboss-as-ejb3-jboss-as-weld-jboss-as-jpa-modul.patch
rename to 0030-Added-jboss-as-ejb3-jboss-as-weld-jboss-as-jpa-modul.patch
index 97e1ad5..80e8d48 100644
--- a/0036-Added-jboss-as-ejb3-jboss-as-weld-jboss-as-jpa-modul.patch
+++ b/0030-Added-jboss-as-ejb3-jboss-as-weld-jboss-as-jpa-modul.patch
@@ -1,22 +1,22 @@
-From 1409395b14fc30ad22a6d59349b149a8e90b8e31 Mon Sep 17 00:00:00 2001
+From dd57761467bda875f19f33cdbe4676d84e44d28c Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Tue, 13 Mar 2012 10:12:43 +0100
-Subject: [PATCH 36/36] Added jboss-as-ejb3, jboss-as-weld, jboss-as-jpa
+Subject: [PATCH 30/43] Added jboss-as-ejb3, jboss-as-weld, jboss-as-jpa
modules
---
- build/build.xml | 95 +++++++++++++++++----------------
- build/pom.xml | 150 ++++++++++++++++++++++++++--------------------------
+ build/build.xml | 95 +++++++++++++++++++--------------------
+ build/pom.xml | 125 +++++++++++++++++++++++++++++++---------------------
clustering/pom.xml | 4 +-
- jpa/pom.xml | 4 +-
+ jpa/pom.xml | 3 +-
pom.xml | 6 +--
- 5 files changed, 130 insertions(+), 129 deletions(-)
+ 5 files changed, 130 insertions(+), 103 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index b31ba53..0fbfee7 100644
+index 56ab4c6..75228d0 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -295,6 +295,10 @@
+@@ -299,6 +299,10 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-web-spi"/>
</module-def>
@@ -27,7 +27,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.as.connector">
<maven-resource group="org.jboss.as" artifact="jboss-as-connector"/>
</module-def>
-@@ -335,6 +339,10 @@
+@@ -339,6 +343,10 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-ee-deployment"/>
</module-def>
@@ -38,7 +38,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.as.embedded">
<maven-resource group="org.jboss.as" artifact="jboss-as-embedded"/>
</module-def>
-@@ -343,6 +351,18 @@
+@@ -347,6 +355,18 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-jmx"/>
</module-def>
@@ -57,7 +57,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.as.logging">
<maven-resource group="org.jboss.as" artifact="jboss-as-logging"/>
</module-def>
-@@ -391,6 +411,10 @@
+@@ -395,6 +415,10 @@
<maven-resource group="org.jboss.web" artifact="jbossweb"/>
</module-def>
@@ -68,7 +68,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.com.sun.httpserver">
<maven-resource group="org.jboss.com.sun.httpserver" artifact="httpserver"/>
</module-def>
-@@ -409,6 +433,18 @@
+@@ -413,6 +437,18 @@
<maven-resource group="org.jboss.ejb3" artifact="jboss-ejb3-ext-api"/>
</module-def>
@@ -87,7 +87,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.invocation">
<maven-resource group="org.jboss.invocation" artifact="jboss-invocation"/>
</module-def>
-@@ -508,6 +544,18 @@
+@@ -516,6 +552,18 @@
<maven-resource group="org.jboss" artifact="jboss-vfs"/>
</module-def>
@@ -106,7 +106,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.xnio">
<maven-resource group="org.jboss.xnio" artifact="xnio-api"/>
</module-def>
-@@ -830,10 +878,6 @@
+@@ -848,10 +896,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-impl"/>
</module-def>
@@ -117,7 +117,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.as.clustering.service">
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-service"/>
</module-def>
-@@ -856,10 +900,6 @@
+@@ -874,10 +918,6 @@
<module-def name="org.jboss.as.domain-add-user" />
@@ -128,7 +128,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.as.host-controller">
<maven-resource group="org.jboss.as" artifact="jboss-as-host-controller"/>
</module-def>
-@@ -887,10 +927,6 @@
+@@ -905,10 +945,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-sos"/>
</module-def>
@@ -139,7 +139,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.as.jpa.hibernate" slot="3">
<maven-resource group="org.jboss.as" artifact="jboss-as-jpa-hibernate3"/>
</module-def>
-@@ -907,14 +943,6 @@
+@@ -921,14 +957,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-jpa-openjpa"/>
</module-def>
@@ -154,7 +154,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.as.mail">
<maven-resource group="org.jboss.as" artifact="jboss-as-mail"/>
</module-def>
-@@ -960,9 +988,6 @@
+@@ -974,9 +1002,6 @@
<!-- this is a dependencies only module for JAXRPC functionalities provided by JBossWS Native stack -->
</module-def>
@@ -164,7 +164,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.as.xts">
<maven-resource group="org.jboss.as" artifact="jboss-as-xts"/>
</module-def>
-@@ -979,18 +1004,6 @@
+@@ -993,18 +1018,6 @@
<!-- Bundling external content into deployments -->
</module-def>
@@ -183,7 +183,7 @@ index b31ba53..0fbfee7 100644
<module-def name="org.jboss.jaxbintros">
<maven-resource group="jboss.jaxbintros" artifact="jboss-jaxb-intros"/>
</module-def>
-@@ -1069,18 +1082,6 @@
+@@ -1086,18 +1099,6 @@
<maven-resource group="org.jboss.shrinkwrap" artifact="shrinkwrap-impl-base"/>
</module-def>
@@ -203,10 +203,10 @@ index b31ba53..0fbfee7 100644
<maven-resource group="org.jboss.ws" artifact="jbossws-common"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 6451832..8e7caf1 100644
+index 74aaf52..11908f4 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -181,6 +181,11 @@
+@@ -210,6 +210,11 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -218,7 +218,7 @@ index 6451832..8e7caf1 100644
<artifactId>jboss-as-connector</artifactId>
</dependency>
-@@ -211,11 +216,31 @@
+@@ -240,11 +245,31 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -250,7 +250,7 @@ index 6451832..8e7caf1 100644
<artifactId>jboss-as-server</artifactId>
</dependency>
-@@ -245,6 +270,11 @@
+@@ -279,6 +304,11 @@
</dependency>
<dependency>
@@ -262,7 +262,7 @@ index 6451832..8e7caf1 100644
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
</dependency>
-@@ -255,6 +285,21 @@
+@@ -299,6 +329,21 @@
</dependency>
<dependency>
@@ -284,7 +284,7 @@ index 6451832..8e7caf1 100644
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
-@@ -420,6 +465,21 @@
+@@ -479,6 +524,21 @@
</dependency>
<dependency>
@@ -306,7 +306,7 @@ index 6451832..8e7caf1 100644
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
-@@ -445,6 +505,21 @@
+@@ -504,6 +564,21 @@
</dependency>
<dependency>
@@ -328,7 +328,7 @@ index 6451832..8e7caf1 100644
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
-@@ -931,21 +1006,6 @@
+@@ -990,21 +1065,6 @@
</dependency>
<dependency>
@@ -350,7 +350,7 @@ index 6451832..8e7caf1 100644
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-appclient</artifactId>
</dependency>
-@@ -973,11 +1033,6 @@
+@@ -1037,11 +1097,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -362,7 +362,7 @@ index 6451832..8e7caf1 100644
<artifactId>jboss-as-clustering-service</artifactId>
</dependency>
-@@ -1029,11 +1084,6 @@
+@@ -1093,11 +1148,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -374,7 +374,7 @@ index 6451832..8e7caf1 100644
<artifactId>jboss-as-embedded</artifactId>
</dependency>
-@@ -1141,11 +1191,6 @@
+@@ -1205,11 +1255,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -386,7 +386,7 @@ index 6451832..8e7caf1 100644
<artifactId>jboss-as-webservices-server-integration</artifactId>
</dependency>
-@@ -1173,11 +1218,6 @@
+@@ -1237,11 +1282,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -398,39 +398,7 @@ index 6451832..8e7caf1 100644
<artifactId>jboss-as-jpa-hibernate3</artifactId>
</dependency>
-@@ -1197,31 +1237,6 @@
- </dependency>
-
- <dependency>
-- <groupId>org.jboss.as</groupId>
-- <artifactId>jboss-as-jpa-spi</artifactId>
-- </dependency>
--
-- <dependency>
-- <groupId>org.jboss.as</groupId>
-- <artifactId>jboss-as-jpa-util</artifactId>
-- </dependency>
--
-- <dependency>
-- <groupId>org.jboss</groupId>
-- <artifactId>jboss-transaction-spi</artifactId>
-- </dependency>
--
-- <dependency>
-- <groupId>org.jboss.interceptor</groupId>
-- <artifactId>jboss-interceptor-core</artifactId>
-- </dependency>
--
-- <dependency>
-- <groupId>org.jboss.interceptor</groupId>
-- <artifactId>jboss-interceptor-spi</artifactId>
-- </dependency>
--
-- <dependency>
- <groupId>org.jboss.ironjacamar</groupId>
- <artifactId>ironjacamar-core-api</artifactId>
- </dependency>
-@@ -1519,21 +1534,6 @@
+@@ -1533,21 +1573,6 @@
</dependency>
<dependency>
@@ -453,7 +421,7 @@ index 6451832..8e7caf1 100644
<artifactId>jbossws-api</artifactId>
</dependency>
diff --git a/clustering/pom.xml b/clustering/pom.xml
-index f1f9014..6962ea4 100644
+index 521cfa1..e533d7e 100644
--- a/clustering/pom.xml
+++ b/clustering/pom.xml
@@ -43,8 +43,8 @@
@@ -468,14 +436,13 @@ index f1f9014..6962ea4 100644
<module>web-spi</module>
<!--<module>web-infinispan</module>
diff --git a/jpa/pom.xml b/jpa/pom.xml
-index 0aa76b7..2451a48 100644
+index 09dd27e..86ca2b8 100644
--- a/jpa/pom.xml
+++ b/jpa/pom.xml
-@@ -44,10 +44,10 @@
+@@ -44,9 +44,10 @@
<module>core</module>
<module>util</module>
<module>spi</module>
-- <module>hibernate-infinispan</module>
+<!-- <module>hibernate-infinispan</module>
<module>hibernate4</module>
<module>hibernate3</module>
@@ -485,10 +452,10 @@ index 0aa76b7..2451a48 100644
<dependencies>
diff --git a/pom.xml b/pom.xml
-index a724747..b6b3f0d 100644
+index 8a22682..adf4037 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -275,8 +275,10 @@
+@@ -282,8 +282,10 @@
<module>domain-management</module>
<module>ee</module>
<module>ee-deployment</module>
@@ -499,7 +466,7 @@ index a724747..b6b3f0d 100644
<module>management-client-content</module>
<module>logging</module>
<module>naming</module>
-@@ -291,6 +293,7 @@
+@@ -298,6 +300,7 @@
<module>threads</module>
<module>transactions</module>
<module>web</module>
@@ -507,15 +474,15 @@ index a724747..b6b3f0d 100644
</modules>
<build>
-@@ -5926,7 +5929,6 @@
+@@ -5974,7 +5977,6 @@
<module>configadmin</module>
- <module>demos</module>
+ <module>config-assembly</module>
<module>dist</module>
- <module>ejb3</module>
<module>host-controller</module>
<!--
<module>jacorb</module>
-@@ -5934,7 +5936,6 @@
+@@ -5982,7 +5984,6 @@
<module>jaxr</module>
<module>jaxrs</module>
<module>jdr</module>
@@ -523,7 +490,7 @@ index a724747..b6b3f0d 100644
<module>jsr77</module>
<module>mail</module>
<module>messaging</module>
-@@ -5945,7 +5946,6 @@
+@@ -5993,7 +5994,6 @@
<module>sar</module>
<module>spec-api</module>
<module>webservices</module>
@@ -532,5 +499,5 @@ index a724747..b6b3f0d 100644
<module>xts</module>
-->
--
-1.7.9.3
+1.7.10
diff --git a/0038-Added-additional-modules-required-on-runtime.patch b/0031-Added-additional-modules-required-on-runtime.patch
similarity index 88%
rename from 0038-Added-additional-modules-required-on-runtime.patch
rename to 0031-Added-additional-modules-required-on-runtime.patch
index d576c40..bca0710 100644
--- a/0038-Added-additional-modules-required-on-runtime.patch
+++ b/0031-Added-additional-modules-required-on-runtime.patch
@@ -1,18 +1,18 @@
-From 557ebae6bda5eaf691a3c8857e223a194af52b49 Mon Sep 17 00:00:00 2001
+From 55eef7e259315e6803d8925116ff4737889546d4 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Fri, 16 Mar 2012 16:08:19 +0100
-Subject: [PATCH 38/38] Added additional modules required on runtime
+Subject: [PATCH 31/43] Added additional modules required on runtime
---
- build/build.xml | 56 +++++++++++++++++++--------------------
+ build/build.xml | 58 +++++++++++++++++++++-------------------
build/pom.xml | 79 +++++++++++++++++++++++++++----------------------------
- 2 files changed, 67 insertions(+), 68 deletions(-)
+ 2 files changed, 70 insertions(+), 67 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 0fbfee7..87e840a 100644
+index 75228d0..b3a2797 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -121,6 +121,14 @@
+@@ -125,6 +125,14 @@
~ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-->
@@ -27,7 +27,7 @@ index 0fbfee7..87e840a 100644
<module-def name="com.sun.jsf-impl">
<maven-resource group="com.sun.faces" artifact="jsf-impl"/>
</module-def>
-@@ -239,6 +247,10 @@
+@@ -243,6 +251,10 @@
<module-def name="javaee.api"/>
@@ -38,7 +38,7 @@ index 0fbfee7..87e840a 100644
<module-def name="org.apache.commons.logging"/>
<module-def name="org.apache.log4j">
-@@ -258,6 +270,14 @@
+@@ -262,6 +274,14 @@
<maven-resource group="org.hibernate" artifact="hibernate-validator"/>
</module-def>
@@ -53,7 +53,7 @@ index 0fbfee7..87e840a 100644
<module-def name="org.jboss.ironjacamar.api">
<maven-resource group="org.jboss.ironjacamar" artifact="ironjacamar-common-api"/>
<maven-resource group="org.jboss.ironjacamar" artifact="ironjacamar-common-spi"/>
-@@ -419,6 +439,10 @@
+@@ -423,6 +443,10 @@
<maven-resource group="org.jboss.com.sun.httpserver" artifact="httpserver"/>
</module-def>
@@ -64,7 +64,7 @@ index 0fbfee7..87e840a 100644
<module-def name="org.jboss.common-core">
<maven-resource group="org.jboss" artifact="jboss-common-core"/>
</module-def>
-@@ -592,6 +616,10 @@
+@@ -600,6 +624,10 @@
<maven-resource group="org.jboss.slf4j" artifact="slf4j-jboss-logmanager"/>
</module-def>
@@ -75,7 +75,7 @@ index 0fbfee7..87e840a 100644
<module-def name="sun.jdk"/>
</target>
-@@ -612,14 +640,6 @@
+@@ -620,14 +648,6 @@
<maven-resource group="asm" artifact="asm" />
</module-def>
@@ -90,18 +90,20 @@ index 0fbfee7..87e840a 100644
<module-def name="com.h2database.h2">
<maven-resource group="com.h2database" artifact="h2"/>
</module-def>
-@@ -703,10 +723,6 @@
- <maven-resource group="commons-codec" artifact="commons-codec"/>
+@@ -715,9 +735,9 @@
+ <maven-resource group="commons-collections" artifact="commons-collections" />
</module-def>
-- <module-def name="org.apache.commons.collections">
-- <maven-resource group="commons-collections" artifact="commons-collections" />
-- </module-def>
--
+- <module-def name="org.apache.commons.configuration">
+- <maven-resource group="commons-configuration" artifact="commons-configuration" />
+- </module-def>
++ <module-def name="org.apache.commons.configuration">
++ <maven-resource group="commons-configuration" artifact="commons-configuration" />
++ </module-def>
+
<module-def name="org.apache.commons.io">
<maven-resource group="commons-io" artifact="commons-io"/>
- </module-def>
-@@ -844,10 +860,6 @@
+@@ -862,10 +882,6 @@
</module-def>
-->
@@ -112,7 +114,7 @@ index 0fbfee7..87e840a 100644
<module-def name="org.jaxen">
<maven-resource group="jaxen" artifact="jaxen"/>
</module-def>
-@@ -992,14 +1004,6 @@
+@@ -1006,14 +1022,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-xts"/>
</module-def>
@@ -127,7 +129,7 @@ index 0fbfee7..87e840a 100644
<module-def name="org.jboss.integration.ext-content">
<!-- Bundling external content into deployments -->
</module-def>
-@@ -1174,10 +1178,6 @@
+@@ -1190,10 +1198,6 @@
<maven-resource group="org.scannotation" artifact="scannotation"/>
</module-def>
@@ -139,10 +141,10 @@ index 0fbfee7..87e840a 100644
<maven-resource group="org.w3c.css" artifact="sac"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 8e7caf1..179c1b9 100644
+index 11908f4..41c616d 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -82,6 +82,20 @@
+@@ -106,6 +106,20 @@
</build>
<dependencies>
@@ -163,7 +165,7 @@ index 8e7caf1..179c1b9 100644
<dependency>
<groupId>com.sun.faces</groupId>
-@@ -138,6 +152,11 @@
+@@ -167,6 +181,11 @@
<artifactId>core</artifactId>
</dependency>
@@ -175,7 +177,7 @@ index 8e7caf1..179c1b9 100644
<!-- TODO: why do we need jandex in minimal? -->
<dependency>
<groupId>org.jboss</groupId>
-@@ -155,6 +174,11 @@
+@@ -184,6 +203,11 @@
</dependency>
<dependency>
@@ -187,7 +189,7 @@ index 8e7caf1..179c1b9 100644
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-clustering-common</artifactId>
</dependency>
-@@ -280,6 +304,16 @@
+@@ -324,6 +348,16 @@
</dependency>
<dependency>
@@ -204,7 +206,7 @@ index 8e7caf1..179c1b9 100644
<groupId>org.jboss.invocation</groupId>
<artifactId>jboss-invocation</artifactId>
</dependency>
-@@ -535,6 +569,11 @@
+@@ -594,6 +628,11 @@
</dependency>
<dependency>
@@ -216,7 +218,7 @@ index 8e7caf1..179c1b9 100644
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
</dependency>
-@@ -569,21 +608,11 @@
+@@ -628,21 +667,11 @@
</dependency>
<dependency>
@@ -238,7 +240,7 @@ index 8e7caf1..179c1b9 100644
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
-@@ -614,11 +643,6 @@
+@@ -673,11 +702,6 @@
</dependency>
<dependency>
@@ -250,7 +252,7 @@ index 8e7caf1..179c1b9 100644
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
-@@ -1001,11 +1025,6 @@
+@@ -1060,11 +1084,6 @@
</dependency>
<dependency>
@@ -262,7 +264,7 @@ index 8e7caf1..179c1b9 100644
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-appclient</artifactId>
</dependency>
-@@ -1202,21 +1221,6 @@
+@@ -1266,21 +1285,6 @@
-->
<dependency>
@@ -284,7 +286,7 @@ index 8e7caf1..179c1b9 100644
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-jpa-hibernate3</artifactId>
</dependency>
-@@ -1665,11 +1669,6 @@
+@@ -1699,11 +1703,6 @@
</dependency>
<dependency>
@@ -297,5 +299,5 @@ index 8e7caf1..179c1b9 100644
<artifactId>sac</artifactId>
</dependency>
--
-1.7.9.3
+1.7.10
diff --git a/0039-Enabled-rest-of-clustering-submodules.patch b/0032-Enabled-rest-of-clustering-submodules.patch
similarity index 94%
rename from 0039-Enabled-rest-of-clustering-submodules.patch
rename to 0032-Enabled-rest-of-clustering-submodules.patch
index 970d207..bf2d698 100644
--- a/0039-Enabled-rest-of-clustering-submodules.patch
+++ b/0032-Enabled-rest-of-clustering-submodules.patch
@@ -1,7 +1,7 @@
-From 6ebfcbf2ca25da8860a9ea888a0a71c08a2b1e9a Mon Sep 17 00:00:00 2001
+From 5d10f0549280ceba4d245a42cc6fe9cf9ef9eec4 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Wed, 21 Mar 2012 09:55:07 +0100
-Subject: [PATCH 39/41] Enabled rest of clustering submodules
+Subject: [PATCH 32/43] Enabled rest of clustering submodules
---
build/build.xml | 40 ++++++++++++++++++++--------------------
@@ -10,10 +10,10 @@ Subject: [PATCH 39/41] Enabled rest of clustering submodules
3 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 87e840a..0eb6970 100644
+index b3a2797..bebd962 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -319,6 +319,26 @@
+@@ -323,6 +323,26 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-registry"/>
</module-def>
@@ -40,7 +40,7 @@ index 87e840a..0eb6970 100644
<module-def name="org.jboss.as.connector">
<maven-resource group="org.jboss.as" artifact="jboss-as-connector"/>
</module-def>
-@@ -882,26 +902,6 @@
+@@ -904,26 +924,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-cli"/>
</module-def>
@@ -68,10 +68,10 @@ index 87e840a..0eb6970 100644
<maven-resource group="org.jboss.as" artifact="jboss-as-configadmin"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 179c1b9..76c3a41 100644
+index 41c616d..ed9ff92 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -210,6 +210,31 @@
+@@ -239,6 +239,31 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -103,7 +103,7 @@ index 179c1b9..76c3a41 100644
<artifactId>jboss-as-connector</artifactId>
</dependency>
-@@ -1041,31 +1066,6 @@
+@@ -1105,31 +1130,6 @@
</dependency>
<dependency>
@@ -136,7 +136,7 @@ index 179c1b9..76c3a41 100644
<artifactId>jboss-as-cmp</artifactId>
</dependency>
diff --git a/clustering/pom.xml b/clustering/pom.xml
-index 6962ea4..dccb39c 100644
+index e533d7e..71efd3b 100644
--- a/clustering/pom.xml
+++ b/clustering/pom.xml
@@ -40,15 +40,15 @@
@@ -161,5 +161,5 @@ index 6962ea4..dccb39c 100644
<dependencies>
--
-1.7.9.3
+1.7.10
diff --git a/0040-Fixed-remoting-jmx-gid-reverting-rmi-changes-adding-.patch b/0033-Fixed-remoting-jmx-gid-reverting-rmi-changes-adding-.patch
similarity index 69%
rename from 0040-Fixed-remoting-jmx-gid-reverting-rmi-changes-adding-.patch
rename to 0033-Fixed-remoting-jmx-gid-reverting-rmi-changes-adding-.patch
index f94364e..6ce6409 100644
--- a/0040-Fixed-remoting-jmx-gid-reverting-rmi-changes-adding-.patch
+++ b/0033-Fixed-remoting-jmx-gid-reverting-rmi-changes-adding-.patch
@@ -1,7 +1,7 @@
-From 47f7ee808a2db06ccf99980c4963362bb11e0712 Mon Sep 17 00:00:00 2001
+From 6bef8ed6f5aefc272d2e07a216afbe1a50f865c1 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Wed, 28 Mar 2012 13:26:18 +0200
-Subject: [PATCH 40/41] Fixed remoting-jmx gid, reverting rmi changes, adding
+Subject: [PATCH 33/43] Fixed remoting-jmx gid, reverting rmi changes, adding
jboss-rmi-1.0-api dep
---
@@ -10,15 +10,13 @@ Subject: [PATCH 40/41] Fixed remoting-jmx gid, reverting rmi changes, adding
.../resources/modules/javaee/api/main/module.xml | 2 +-
.../modules/javax/ejb/api/main/module.xml | 2 +-
.../modules/org/jboss/as/ejb3/main/module.xml | 2 +-
- jmx/pom.xml | 2 +-
- pom.xml | 6 +++---
- 7 files changed, 21 insertions(+), 21 deletions(-)
+ 5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 0eb6970..6c47f99 100644
+index bebd962..361180d 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -203,6 +203,10 @@
+@@ -207,6 +207,10 @@
<maven-resource group="org.jboss.spec.javax.jms" artifact="jboss-jms-api_1.1_spec"/>
</module-def>
@@ -29,7 +27,7 @@ index 0eb6970..6c47f99 100644
<module-def name="javax.mail.api">
<maven-resource group="javax.mail" artifact="mail"/>
</module-def>
-@@ -701,10 +705,6 @@
+@@ -709,10 +713,6 @@
<maven-resource group="org.jboss.spec.javax.management.j2ee" artifact="jboss-j2eemgmt-api_1.1_spec"/>
</module-def>
@@ -41,10 +39,10 @@ index 0eb6970..6c47f99 100644
<maven-resource group="org.jboss.spec.javax.ws.rs" artifact="jboss-jaxrs-api_1.1_spec"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 76c3a41..fa28a32 100644
+index ed9ff92..259abe0 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -524,6 +524,16 @@
+@@ -583,6 +583,16 @@
</dependency>
<dependency>
@@ -61,7 +59,7 @@ index 76c3a41..fa28a32 100644
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api</artifactId>
</dependency>
-@@ -1498,16 +1508,6 @@
+@@ -1537,16 +1547,6 @@
</dependency>
<dependency>
@@ -105,7 +103,7 @@ index fe5f6e9..57a2fd1 100644
</dependencies>
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 de651d6..1a660fb 100644
+index 4785e5f..aac0653 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,7 @@
@@ -117,44 +115,6 @@ index de651d6..1a660fb 100644
<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/jmx/pom.xml b/jmx/pom.xml
-index 9038bd4..8db2b1e 100644
---- a/jmx/pom.xml
-+++ b/jmx/pom.xml
-@@ -76,7 +76,7 @@
- <artifactId>jboss-as-server</artifactId>
- </dependency>
- <dependency>
-- <groupId>org.jboss.remoting3</groupId>
-+ <groupId>org.jboss.remotingjmx</groupId>
- <artifactId>remoting-jmx</artifactId>
- </dependency>
- <dependency>
-diff --git a/pom.xml b/pom.xml
-index 500788d..b9e503d 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -179,7 +179,7 @@
- <version.org.jboss.osgi.spi>2.0.4</version.org.jboss.osgi.spi>
- <version.org.jboss.remote-naming>1.0.1.Final</version.org.jboss.remote-naming>
- <version.org.jboss.remoting3>3.2.2.GA</version.org.jboss.remoting3>
-- <version.org.jboss.remoting3.remoting-jmx>1.0.0.Final</version.org.jboss.remoting3.remoting-jmx>
-+ <version.org.jboss.remotingjmx.remoting-jmx>1.0.2.Final</version.org.jboss.remotingjmx.remoting-jmx>
- <version.org.jboss.resteasy>2.3.1.GA</version.org.jboss.resteasy>
- <version.org.jboss.sasl>1.0.0.Final</version.org.jboss.sasl>
- <version.org.jboss.seam.int>6.0.0.GA</version.org.jboss.seam.int>
-@@ -4365,9 +4365,9 @@
- </dependency>
-
- <dependency>
-- <groupId>org.jboss.remoting3</groupId>
-+ <groupId>org.jboss.remotingjmx</groupId>
- <artifactId>remoting-jmx</artifactId>
-- <version>${version.org.jboss.remoting3.remoting-jmx}</version>
-+ <version>${version.org.jboss.remotingjmx.remoting-jmx}</version>
- </dependency>
-
- <dependency>
--
-1.7.9.3
+1.7.10
diff --git a/0042-Added-standalone-web.xml-example-configuration.-Use-.patch b/0034-Added-standalone-web.xml-example-configuration.-Use-.patch
similarity index 98%
rename from 0042-Added-standalone-web.xml-example-configuration.-Use-.patch
rename to 0034-Added-standalone-web.xml-example-configuration.-Use-.patch
index 6b48caf..d5a8d4e 100644
--- a/0042-Added-standalone-web.xml-example-configuration.-Use-.patch
+++ b/0034-Added-standalone-web.xml-example-configuration.-Use-.patch
@@ -1,7 +1,7 @@
-From 79c0eed573245b1d2f92fce237eb29fa748d65f1 Mon Sep 17 00:00:00 2001
+From 9421d18b63e3501147365b59e0caf1cfffdedfc0 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 42/44] Added standalone-web.xml example configuration. Use
+Subject: [PATCH 34/43] Added standalone-web.xml example configuration. Use
this by default in Fedora.
---
@@ -254,5 +254,5 @@ index 0000000..02074d2
+
+</server>
--
-1.7.9.3
+1.7.10
diff --git a/0043-Add-systemd-files-re-arrange-directory-with-init-scr.patch b/0035-Add-systemd-files-re-arrange-directory-with-init-scr.patch
similarity index 78%
rename from 0043-Add-systemd-files-re-arrange-directory-with-init-scr.patch
rename to 0035-Add-systemd-files-re-arrange-directory-with-init-scr.patch
index cad093e..b241685 100644
--- a/0043-Add-systemd-files-re-arrange-directory-with-init-scr.patch
+++ b/0035-Add-systemd-files-re-arrange-directory-with-init-scr.patch
@@ -1,22 +1,23 @@
-From 531336986340b9a3434d38abaf89feda3530f766 Mon Sep 17 00:00:00 2001
+From 5c8895b2f5819f34e82d05bbbed0a8c96b9767e3 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 43/44] Add systemd files, re-arrange directory with init
+Subject: [PATCH 35/43] Add systemd files, re-arrange directory with init
scripts
---
.../resources/bin/init.d/jboss-as-standalone.sh | 175 -------------------
build/src/main/resources/bin/init.d/jboss-as.conf | 22 ---
- .../main/resources/bin/initscripts/jboss-as.conf | 22 +++
- .../bin/initscripts/systemd/jboss-as.service | 13 ++
- .../resources/bin/initscripts/systemd/jboss-as.sh | 88 ++++++++++
+ .../bin/initscripts/systemd/jboss-as.conf | 4 +
+ .../bin/initscripts/systemd/jboss-as.service | 17 ++
+ .../resources/bin/initscripts/sysv/jboss-as.conf | 22 +++
.../resources/bin/initscripts/sysv/jboss-as.sh | 176 ++++++++++++++++++++
- 6 files changed, 299 insertions(+), 197 deletions(-)
+ build/src/main/resources/bin/standalone.sh | 4 +
+ 7 files changed, 223 insertions(+), 197 deletions(-)
delete mode 100755 build/src/main/resources/bin/init.d/jboss-as-standalone.sh
delete mode 100644 build/src/main/resources/bin/init.d/jboss-as.conf
- create mode 100644 build/src/main/resources/bin/initscripts/jboss-as.conf
+ create mode 100644 build/src/main/resources/bin/initscripts/systemd/jboss-as.conf
create mode 100644 build/src/main/resources/bin/initscripts/systemd/jboss-as.service
- create mode 100755 build/src/main/resources/bin/initscripts/systemd/jboss-as.sh
+ create mode 100644 build/src/main/resources/bin/initscripts/sysv/jboss-as.conf
create mode 100755 build/src/main/resources/bin/initscripts/sysv/jboss-as.sh
diff --git a/build/src/main/resources/bin/init.d/jboss-as-standalone.sh b/build/src/main/resources/bin/init.d/jboss-as-standalone.sh
@@ -228,18 +229,51 @@ index cbe4aa7..0000000
-# The configuration you want to run
-#
-JBOSS_CONFIG=standalone-web.xml
-diff --git a/build/src/main/resources/bin/initscripts/jboss-as.conf b/build/src/main/resources/bin/initscripts/jboss-as.conf
+diff --git a/build/src/main/resources/bin/initscripts/systemd/jboss-as.conf b/build/src/main/resources/bin/initscripts/systemd/jboss-as.conf
new file mode 100644
-index 0000000..cbe4aa7
+index 0000000..82699ad
--- /dev/null
-+++ b/build/src/main/resources/bin/initscripts/jboss-as.conf
++++ b/build/src/main/resources/bin/initscripts/systemd/jboss-as.conf
+@@ -0,0 +1,4 @@
++# The configuration you want to run
++#
++JBOSS_CONFIG=standalone-web.xml
++
+diff --git a/build/src/main/resources/bin/initscripts/systemd/jboss-as.service b/build/src/main/resources/bin/initscripts/systemd/jboss-as.service
+new file mode 100644
+index 0000000..32c1c10
+--- /dev/null
++++ b/build/src/main/resources/bin/initscripts/systemd/jboss-as.service
+@@ -0,0 +1,17 @@
++[Unit]
++Description=The JBoss Application Server
++After=syslog.target network.target
++Before=httpd.service
++
++[Service]
++Environment=LAUNCH_JBOSS_IN_BACKGROUND=1
++EnvironmentFile=-/etc/jboss-as/jboss-as.conf
++User=jboss-as
++LimitNOFILE=102642
++PIDFile=/var/run/jboss-as/jboss-as.pid
++ExecStart=/usr/share/jboss-as/bin/standalone.sh -c $JBOSS_CONFIG
++StandardOutput=null
++
++[Install]
++WantedBy=multi-user.target
++
+diff --git a/build/src/main/resources/bin/initscripts/sysv/jboss-as.conf b/build/src/main/resources/bin/initscripts/sysv/jboss-as.conf
+new file mode 100644
+index 0000000..d999aca
+--- /dev/null
++++ b/build/src/main/resources/bin/initscripts/sysv/jboss-as.conf
@@ -0,0 +1,22 @@
+# General configuration for the init.d scripts,
+# not necessarily for JBoss AS itself.
+
+# The username who should own the process.
+#
-+JBOSS_USER=jboss-as
++# JBOSS_USER=jboss-as
+
+# The amount of time to wait for startup
+#
@@ -255,120 +289,7 @@ index 0000000..cbe4aa7
+
+# The configuration you want to run
+#
-+JBOSS_CONFIG=standalone-web.xml
-diff --git a/build/src/main/resources/bin/initscripts/systemd/jboss-as.service b/build/src/main/resources/bin/initscripts/systemd/jboss-as.service
-new file mode 100644
-index 0000000..5bbc880
---- /dev/null
-+++ b/build/src/main/resources/bin/initscripts/systemd/jboss-as.service
-@@ -0,0 +1,13 @@
-+[Unit]
-+Description=The JBoss Application Server
-+After=network.target remote-fs.target nss-lookup.target
-+
-+[Service]
-+Type=forking
-+EnvironmentFile=-/etc/sysconfig/jboss-as
-+ExecStart=/usr/share/jboss-as/bin/jboss-as-standalone.sh $OPTIONS start
-+ExecStop=/usr/share/jboss-as/bin/jboss-as-standalone.sh stop
-+PrivateTmp=true
-+
-+[Install]
-+WantedBy=multi-user.target
-diff --git a/build/src/main/resources/bin/initscripts/systemd/jboss-as.sh b/build/src/main/resources/bin/initscripts/systemd/jboss-as.sh
-new file mode 100755
-index 0000000..da57af6
---- /dev/null
-+++ b/build/src/main/resources/bin/initscripts/systemd/jboss-as.sh
-@@ -0,0 +1,88 @@
-+#!/bin/sh
-+
-+# Load Java configuration.
-+[ -r /etc/java/java.conf ] && . /etc/java/java.conf
-+
-+export JAVA_HOME
-+
-+# Load JBoss AS configuration.
-+if [ -z "$JBOSS_CONF" ]; then
-+ JBOSS_CONF="/etc/sysconfig/jboss-as"
-+fi
-+
-+[ -r "$JBOSS_CONF" ] && . "${JBOSS_CONF}"
-+
-+if [ -z "$JBOSS_HOME" ]; then
-+ JBOSS_HOME=/usr/share/jboss-as
-+fi
-+
-+export JBOSS_HOME
-+
-+if [ -z "$JBOSS_PIDFILE" ]; then
-+ JBOSS_PIDFILE=/var/run/jboss-as/jboss-as.pid
-+fi
-+
-+if [ -z "$JBOSS_CONSOLE_LOG" ]; then
-+ JBOSS_CONSOLE_LOG=/var/log/jboss-as/console.log
-+fi
-+
-+if [ -z "$JBOSS_CONFIG" ]; then
-+ JBOSS_CONFIG=standalone.xml
-+fi
-+
-+if [ -z "$JBOSS_SCRIPT" ]; then
-+ JBOSS_SCRIPT=$JBOSS_HOME/bin/standalone.sh
-+fi
-+
-+# For SELinux we need to use 'runuser' not 'su'
-+if [ -x "/sbin/runuser" ]; then
-+ SU="/sbin/runuser -s /bin/sh"
-+else
-+ SU="/bin/su -s /bin/sh"
-+fi
-+
-+start() {
-+ if [ -f $JBOSS_PIDFILE ]; then
-+ read ppid < $JBOSS_PIDFILE
-+ if [ `ps --pid $ppid 2> /dev/null | grep -c $ppid 2> /dev/null` -eq '1' ]; then
-+ failure
-+ echo
-+ return 1
-+ else
-+ rm -f $JBOSS_PIDFILE
-+ fi
-+ fi
-+ mkdir -p $(dirname $JBOSS_CONSOLE_LOG)
-+ cat /dev/null > $JBOSS_CONSOLE_LOG
-+
-+ mkdir -p $(dirname $JBOSS_PIDFILE)
-+ chown $JBOSS_USER $(dirname $JBOSS_PIDFILE) || true
-+
-+ $SU - $JBOSS_USER -c "LAUNCH_JBOSS_IN_BACKGROUND=1 JBOSS_PIDFILE=$JBOSS_PIDFILE $JBOSS_SCRIPT -c $JBOSS_CONFIG" 2>&1 > $JBOSS_CONSOLE_LOG &
-+}
-+
-+stop() {
-+ if [ -f $JBOSS_PIDFILE ]; then
-+ read kpid < $JBOSS_PIDFILE
-+ kill -15 $kpid
-+ rm -f $JBOSS_PIDFILE
-+ fi
-+}
-+
-+case "$1" in
-+ start)
-+ start
-+ ;;
-+ stop)
-+ stop
-+ ;;
-+ restart)
-+ $0 stop
-+ $0 start
-+ ;;
-+ *)
-+ echo "Usage: $0 {start|stop|restart}"
-+ exit 1
-+ ;;
-+esac
-+
++# JBOSS_CONFIG=standalone.xml
diff --git a/build/src/main/resources/bin/initscripts/sysv/jboss-as.sh b/build/src/main/resources/bin/initscripts/sysv/jboss-as.sh
new file mode 100755
index 0000000..7763855
@@ -551,6 +472,21 @@ index 0000000..7763855
+ exit 1
+ ;;
+esac
+diff --git a/build/src/main/resources/bin/standalone.sh b/build/src/main/resources/bin/standalone.sh
+index 364dd9e..a3c32da 100755
+--- a/build/src/main/resources/bin/standalone.sh
++++ b/build/src/main/resources/bin/standalone.sh
+@@ -147,6 +147,10 @@ fi
+ if [ "x$JBOSS_CONFIG_DIR" = "x" ]; then
+ JBOSS_CONFIG_DIR="$JBOSS_BASE_DIR/configuration"
+ fi
++# determine the default pid file location dir, if not set
++if [ "x$JBOSS_PIDFILE" = "x" ]; then
++ JBOSS_PIDFILE="/var/run/jboss-as/jboss-as.pid"
++fi
+
+ # For Cygwin, switch paths to Windows format before running java
+ if $cygwin; then
--
-1.7.9.3
+1.7.10
diff --git a/0045-Added-jboss-as-cli-module.patch b/0036-Added-jboss-as-cli-module.patch
similarity index 71%
rename from 0045-Added-jboss-as-cli-module.patch
rename to 0036-Added-jboss-as-cli-module.patch
index 743e744..027b81c 100644
--- a/0045-Added-jboss-as-cli-module.patch
+++ b/0036-Added-jboss-as-cli-module.patch
@@ -1,20 +1,20 @@
-From 43fbef5e2027b413c956326582a297da57a8bed1 Mon Sep 17 00:00:00 2001
+From 2f11d1b526f5f42bc1bd99758b1ddef79aeca15c Mon Sep 17 00:00:00 2001
From: Patryk Obara <dreamer.tan at gmail.com>
Date: Thu, 5 Apr 2012 12:54:16 +0200
-Subject: [PATCH 45/47] Added-jboss-as-cli-module
+Subject: [PATCH 36/43] Added-jboss-as-cli-module
With jline as dependency.
---
build/build.xml | 16 ++++++++--------
- build/pom.xml | 20 ++++++++++----------
+ build/pom.xml | 10 ++++++++++
pom.xml | 2 +-
- 3 files changed, 19 insertions(+), 19 deletions(-)
+ 3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 529af0e..04c2e76 100644
+index 361180d..1e40bf7 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -145,6 +145,10 @@
+@@ -149,6 +149,10 @@
<maven-resource group="org.hibernate.javax.persistence" artifact="hibernate-jpa-2.0-api"/>
</module-def>
@@ -25,7 +25,7 @@ index 529af0e..04c2e76 100644
<module-def name="org.infinispan">
<maven-resource group="org.infinispan" artifact="infinispan-core"/>
</module-def>
-@@ -299,6 +303,10 @@
+@@ -303,6 +307,10 @@
<maven-resource group="org.jboss.ironjacamar" artifact="ironjacamar-jdbc"/>
</module-def>
@@ -36,7 +36,7 @@ index 529af0e..04c2e76 100644
<module-def name="org.jboss.as.clustering.api">
<maven-resource group="org.jboss.as" artifact="jboss-as-clustering-api"/>
</module-def>
-@@ -719,10 +727,6 @@
+@@ -727,10 +735,6 @@
<maven-resource group="org.jboss.spec.javax.xml.ws" artifact="jboss-jaxws-api_2.2_spec"/>
</module-def>
@@ -47,7 +47,7 @@ index 529af0e..04c2e76 100644
<module-def name="net.sourceforge.cssparser">
<maven-resource group="net.sourceforge.cssparser" artifact="cssparser"/>
</module-def>
-@@ -898,10 +902,6 @@
+@@ -920,10 +924,6 @@
<maven-resource-with-classifier group="org.jboss.as" artifact="jboss-as-console" classifier="resources"/>
</module-def>
@@ -59,10 +59,10 @@ index 529af0e..04c2e76 100644
<maven-resource group="org.jboss.as" artifact="jboss-as-configadmin"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 499f542..bd882b7 100644
+index 259abe0..e826cb8 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -180,6 +180,11 @@
+@@ -209,6 +209,11 @@
<dependency>
<groupId>org.jboss.as</groupId>
@@ -74,7 +74,7 @@ index 499f542..bd882b7 100644
<artifactId>jboss-as-clustering-common</artifactId>
</dependency>
-@@ -589,6 +594,11 @@
+@@ -648,6 +653,11 @@
</dependency>
<dependency>
@@ -86,35 +86,11 @@ index 499f542..bd882b7 100644
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
-@@ -745,11 +755,6 @@
- </dependency>
-
- <dependency>
-- <groupId>jline</groupId>
-- <artifactId>jline</artifactId>
-- </dependency>
--
-- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-@@ -1066,11 +1071,6 @@
-
- <dependency>
- <groupId>org.jboss.as</groupId>
-- <artifactId>jboss-as-cli</artifactId>
-- </dependency>
--
-- <dependency>
-- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-client-all</artifactId>
- <scope>provided</scope>
- </dependency>
diff --git a/pom.xml b/pom.xml
-index b9e503d..13ba795 100644
+index adf4037..716b45d 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -265,6 +265,7 @@
+@@ -272,6 +272,7 @@
<modules>
<module>build</module>
<module>build-config</module>
@@ -122,7 +98,7 @@ index b9e503d..13ba795 100644
<module>clustering</module>
<module>connector</module>
<module>controller</module>
-@@ -5921,7 +5922,6 @@
+@@ -5969,7 +5970,6 @@
<module>build</module>
<module>build-config</module>
<module>arquillian</module>
diff --git a/0046-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch b/0037-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
similarity index 85%
rename from 0046-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
rename to 0037-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
index 3df4780..4503159 100644
--- a/0046-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
+++ b/0037-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
@@ -1,7 +1,7 @@
-From 65d80242031d8541935b9c924cc024357b5348fc Mon Sep 17 00:00:00 2001
+From 86e5a4857b5d8d33755e92b5ca05b87029985c30 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 46/47] Fix JBOSS_HOME when jboss-cli.sh is executed through
+Subject: [PATCH 37/43] Fix JBOSS_HOME when jboss-cli.sh is executed through
symbolic link
---
diff --git a/0048-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch b/0038-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
similarity index 81%
rename from 0048-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
rename to 0038-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
index 2c98c6f..a477265 100644
--- a/0048-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
+++ b/0038-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
@@ -1,7 +1,7 @@
-From d5a79ab1f7506a8e43c231b5c15447b468e4a3b7 Mon Sep 17 00:00:00 2001
+From b1f5a58e102b7e490b7bf9ed3d1837e29cd18924 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 48/48] [AS7-3800] JBOSS_BASE_DIR is checked in standalone.sh
+Subject: [PATCH 38/43] [AS7-3800] JBOSS_BASE_DIR is checked in standalone.sh
but not used to set -Djboss.server.base.dir
---
@@ -9,10 +9,10 @@ Subject: [PATCH 48/48] [AS7-3800] JBOSS_BASE_DIR is checked in standalone.sh
1 file changed, 2 insertions(+)
diff --git a/build/src/main/resources/bin/standalone.sh b/build/src/main/resources/bin/standalone.sh
-index 1e02120..7aee924 100755
+index a3c32da..80b95c5 100755
--- a/build/src/main/resources/bin/standalone.sh
+++ b/build/src/main/resources/bin/standalone.sh
-@@ -186,6 +186,7 @@ while true; do
+@@ -187,6 +187,7 @@ while true; do
-jaxpmodule "javax.xml.jaxp-provider" \
org.jboss.as.standalone \
-Djboss.home.dir=\"$JBOSS_HOME\" \
@@ -20,7 +20,7 @@ index 1e02120..7aee924 100755
"$@"
JBOSS_STATUS=$?
else
-@@ -198,6 +199,7 @@ while true; do
+@@ -199,6 +200,7 @@ while true; do
-jaxpmodule "javax.xml.jaxp-provider" \
org.jboss.as.standalone \
-Djboss.home.dir=\"$JBOSS_HOME\" \
diff --git a/0049-Added-domain-add-user-module.patch b/0039-Added-domain-add-user-module.patch
similarity index 83%
rename from 0049-Added-domain-add-user-module.patch
rename to 0039-Added-domain-add-user-module.patch
index 70e4c8d..78d885c 100644
--- a/0049-Added-domain-add-user-module.patch
+++ b/0039-Added-domain-add-user-module.patch
@@ -1,17 +1,17 @@
-From be152c72271132cc0614e291b4c822b3c6593e6f Mon Sep 17 00:00:00 2001
+From 16010de4c48e86a6b88db7cb3ee730a4b55ab96b Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
Date: Fri, 13 Apr 2012 13:38:24 +0200
-Subject: [PATCH 49/49] Added domain-add-user module
+Subject: [PATCH 39/43] Added domain-add-user module
---
build/build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 04c2e76..636e2b5 100644
+index 1e40bf7..4bbc1ab 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -371,6 +371,8 @@
+@@ -375,6 +375,8 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-deployment-scanner"/>
</module-def>
@@ -20,7 +20,7 @@ index 04c2e76..636e2b5 100644
<module-def name="org.jboss.as.domain-http-error-context">
<maven-resource group="org.jboss.as" artifact="jboss-as-domain-http-error-context"/>
</module-def>
-@@ -910,8 +912,6 @@
+@@ -932,8 +934,6 @@
<maven-resource group="org.jboss.as" artifact="jboss-as-cmp"/>
</module-def>
diff --git a/0052-Remove-activation-module.patch b/0040-Remove-activation-module.patch
similarity index 95%
rename from 0052-Remove-activation-module.patch
rename to 0040-Remove-activation-module.patch
index 4a407f9..ac3bde7 100644
--- a/0052-Remove-activation-module.patch
+++ b/0040-Remove-activation-module.patch
@@ -1,7 +1,7 @@
-From ab566f0fdf0ecbba2435e1e981a6df53eca6c8c2 Mon Sep 17 00:00:00 2001
+From c95955b6aaccccb14f73e6935be4602d544acafd 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 52/52] Remove activation module
+Subject: [PATCH 40/43] Remove activation module
---
build/build.xml | 4 --
@@ -20,10 +20,10 @@ Subject: [PATCH 52/52] Remove activation module
delete mode 100644 build/src/main/resources/modules/javax/activation/api/main/module.xml
diff --git a/build/build.xml b/build/build.xml
-index 636e2b5..77fc784 100644
+index 4bbc1ab..f637bb1 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -699,10 +699,6 @@
+@@ -707,10 +707,6 @@
<maven-resource group="gnu-getopt" artifact="getopt" />
</module-def>
@@ -35,10 +35,10 @@ index 636e2b5..77fc784 100644
<maven-resource group="javax.faces" artifact="jsf-api"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index bd882b7..365d2fc 100644
+index e826cb8..6fc687f 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -720,11 +720,6 @@
+@@ -779,11 +779,6 @@
-->
<dependency>
@@ -51,10 +51,10 @@ index bd882b7..365d2fc 100644
<artifactId>jsf-api</artifactId>
</dependency>
diff --git a/build/src/license/licenses.xml b/build/src/license/licenses.xml
-index 3e5dbc2..dc4ea97 100644
+index 5ff098a..a1bf243 100644
--- a/build/src/license/licenses.xml
+++ b/build/src/license/licenses.xml
-@@ -241,22 +241,6 @@
+@@ -234,22 +234,6 @@
</licenses>
</dependency>
<dependency>
@@ -212,18 +212,18 @@ index 0c06cc0..4f821ff 100644
<module name="org.apache.commons.codec" />
<module name="org.apache.httpcomponents" />
diff --git a/pom.xml b/pom.xml
-index 13ba795..56c7d43 100644
+index 716b45d..c45f875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,6 @@
+ <version.com.h2database>1.3.161</version.com.h2database>
<version.dom4j>1.6.1</version.dom4j>
<version.gnu.getopt>1.0.13</version.gnu.getopt>
- <version.jacorb>2.3.1.jbossorg-1</version.jacorb>
- <version.javax.activation>1.1.1</version.javax.activation>
<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.5-jbossorg-1</version.javax.faces.jsf-impl>
-@@ -1279,12 +1278,6 @@
+ <version.javax.faces.jsf-impl>2.1.7-jbossorg-2</version.javax.faces.jsf-impl>
+@@ -1313,12 +1312,6 @@
</dependency>
<dependency>
diff --git a/0053-Use-properties-in-add-user-AS7-module.patch b/0041-Use-properties-in-add-user-AS7-module.patch
similarity index 95%
rename from 0053-Use-properties-in-add-user-AS7-module.patch
rename to 0041-Use-properties-in-add-user-AS7-module.patch
index 75170e8..1fbcd17 100644
--- a/0053-Use-properties-in-add-user-AS7-module.patch
+++ b/0041-Use-properties-in-add-user-AS7-module.patch
@@ -1,22 +1,21 @@
-From 5e20ac99edbb5b858716d6a139d3b59113eefdcb Mon Sep 17 00:00:00 2001
+From a092b24a4395bcf9e7f5af6eb627c314364c5516 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 53/53] Use properties in add-user AS7 module
+Subject: [PATCH 41/43] Use properties in add-user AS7 module
---
- build/src/main/resources/bin/add-user.sh | 11 +
- .../management/DomainManagementMessages.java | 66 ++-
- .../management/security/AddPropertiesUser.java | 584 ++------------------
+ .../management/DomainManagementMessages.java | 51 +-
+ .../management/security/AddPropertiesUser.java | 634 ++------------------
.../domain/management/security/ConsoleWrapper.java | 85 +++
- .../as/domain/management/security/JavaConsole.java | 66 +++
+ .../as/domain/management/security/JavaConsole.java | 66 ++
.../management/security/PropertiesFileLoader.java | 60 +-
.../domain/management/security/state/AddUser.java | 88 +++
- .../security/state/ConfirmationChoice.java | 95 ++++
+ .../security/state/ConfirmationChoice.java | 95 +++
.../security/state/DuplicateUserCheckState.java | 68 +++
.../management/security/state/ErrorState.java | 74 +++
.../security/state/PromptNewUserState.java | 114 ++++
.../security/state/PromptPasswordState.java | 86 +++
- .../security/state/PropertyFileFinder.java | 190 +++++++
+ .../security/state/PropertyFileFinder.java | 190 ++++++
.../security/state/PropertyFilePrompt.java | 104 ++++
.../as/domain/management/security/state/State.java | 34 ++
.../management/security/state/StateValues.java | 142 +++++
@@ -24,7 +23,7 @@ Subject: [PATCH 53/53] Use properties in add-user AS7 module
.../management/security/state/UpdateUser.java | 88 +++
.../security/state/UserPropertiesFileHandler.java | 38 ++
.../management/security/state/WeakCheckState.java | 90 +++
- 20 files changed, 1631 insertions(+), 563 deletions(-)
+ 19 files changed, 1603 insertions(+), 615 deletions(-)
create mode 100644 domain-management/src/main/java/org/jboss/as/domain/management/security/ConsoleWrapper.java
create mode 100644 domain-management/src/main/java/org/jboss/as/domain/management/security/JavaConsole.java
create mode 100644 domain-management/src/main/java/org/jboss/as/domain/management/security/state/AddUser.java
@@ -42,80 +41,17 @@ Subject: [PATCH 53/53] Use properties in add-user AS7 module
create mode 100644 domain-management/src/main/java/org/jboss/as/domain/management/security/state/UserPropertiesFileHandler.java
create mode 100644 domain-management/src/main/java/org/jboss/as/domain/management/security/state/WeakCheckState.java
-diff --git a/build/src/main/resources/bin/add-user.sh b/build/src/main/resources/bin/add-user.sh
-index dfb0c8b..eeb6ccc 100755
---- a/build/src/main/resources/bin/add-user.sh
-+++ b/build/src/main/resources/bin/add-user.sh
-@@ -51,6 +51,15 @@ if [ "x$JBOSS_MODULEPATH" = "x" ]; then
- JBOSS_MODULEPATH="$JBOSS_HOME/modules"
- fi
-
-+# determine the default base dir, if not set
-+if [ "x$JBOSS_BASE_DIR" = "x" ]; then
-+ JBOSS_BASE_DIR="$JBOSS_HOME/standalone"
-+fi
-+# determine the default base dir for domain mode, if not set
-+if [ "x$JBOSS_DOMAIN_BASE_DIR" = "x" ]; then
-+ JBOSS_DOMAIN_BASE_DIR="$JBOSS_HOME/domain"
-+fi
-+
- # For Cygwin, switch paths to Windows format before running java
- if $cygwin; then
- JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`
-@@ -64,6 +73,8 @@ fi
- #JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
-
- eval \"$JAVA\" $JAVA_OPTS \
-+ -Djboss.server.base.dir=\"$JBOSS_BASE_DIR\" \
-+ -Djboss.domain.base.dir=\"$JBOSS_DOMAIN_BASE_DIR\" \
- -jar \"$JBOSS_HOME/jboss-modules.jar\" \
- -mp \"${JBOSS_MODULEPATH}\" \
- org.jboss.as.domain-add-user \
diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/DomainManagementMessages.java b/domain-management/src/main/java/org/jboss/as/domain/management/DomainManagementMessages.java
-index 283a985..c9be048 100644
+index c260e79..c9be048 100644
--- a/domain-management/src/main/java/org/jboss/as/domain/management/DomainManagementMessages.java
+++ b/domain-management/src/main/java/org/jboss/as/domain/management/DomainManagementMessages.java
-@@ -185,7 +185,7 @@ public interface DomainManagementMessages {
- String jbossHomeNotSet();
-
- /**
-- * A message indicating no mgmt-users.properties have been foun.
-+ * A message indicating no mgmt-users.properties have been found.
- *
- * @return a {@link String} for the message.
- */
-@@ -430,7 +430,7 @@ public interface DomainManagementMessages {
- /**
- * Creates an IllegalArgumentException indicating that a value can not be null.
- *
-- * @param name - The name of the paramter that can not be null.
-+ * @param name - The name of the parameter that can not be null.
- * @return an {@link IllegalArgumentException} for the error.
- */
- @Message(id = 15248, value = "'%s' can not be null.")
-@@ -459,7 +459,7 @@ public interface DomainManagementMessages {
- String filePrompt();
-
- /**
-- * Propmpt the user for the roles to add the user to
-+ * Prompt the user for the roles to add the user to
- * @return
- */
- @Message(value = "What roles do you want this user to belong to? (Please enter a comma separated list, or leave blank for none)")
-@@ -478,4 +478,64 @@ public interface DomainManagementMessages {
- @Message(value = "Added user '%s' with roles %s to file '%s'")
- String addedRoles(String username, String roles, String fileName);
+@@ -488,9 +488,54 @@ public interface DomainManagementMessages {
+ @Message(id = 15251, value = "Invalid response. (Valid responses are A, a, B, or b)")
+ String invalidChoiceResponse();
-+ /**
-+ * The error message if the choice response is invalid.
-+ *
-+ * TODO - On translation we will need support for checking the possible responses.
-+ *
-+ * @return a {@link String} for the message.
-+ */
-+ @Message(id = 15251, value = "Invalid response. (Valid responses are A, a, B, or b)")
-+ String invalidChoiceResponse();
-+
+- /*
+- * Logging IDs 15200 to 15299 are reserved for domain management, the file DomainManagementLogger also contains messages in
+- * this range commencing 15200.
+ /**
+ * Confirmation if the current user password and roles is about to be updated.
+ *
@@ -133,12 +69,12 @@ index 283a985..c9be048 100644
+ * @param fileName - The file the user has been added to.
+ *
+ * @return a {@link String} for the message.
-+ */
+ */
+ @Message(value = "Updated user '%s' to file '%s'")
+ String updateUser(String userName, String canonicalPath);
+
+
-+
+
+ /**
+ * The error message if updating user to the file fails.
+ *
@@ -168,23 +104,25 @@ index 283a985..c9be048 100644
+ */
}
diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java b/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
-index a52f501..b27c7dd 100644
+index 405c80c..f58a799 100644
--- a/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
+++ b/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
-@@ -22,24 +22,17 @@
+@@ -22,27 +22,19 @@
package org.jboss.as.domain.management.security;
--import java.io.BufferedWriter;
+-import static org.jboss.as.domain.management.DomainManagementMessages.MESSAGES;
+import org.jboss.as.domain.management.security.state.PropertyFileFinder;
+import org.jboss.as.domain.management.security.state.PropertyFilePrompt;
+import org.jboss.as.domain.management.security.state.State;
+import org.jboss.as.domain.management.security.state.StateValues;
-+
+
+-import java.io.BufferedWriter;
import java.io.Closeable;
-import java.io.Console;
-import java.io.File;
-import java.io.FileInputStream;
+-import java.io.FileReader;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.StringReader;
@@ -196,16 +134,17 @@ index a52f501..b27c7dd 100644
import java.util.List;
import java.util.Properties;
-import java.util.Set;
--
--import org.jboss.sasl.util.UsernamePasswordHashUtil;
- import static org.jboss.as.domain.management.DomainManagementMessages.MESSAGES;
+-import org.jboss.sasl.util.UsernamePasswordHashUtil;
++import static org.jboss.as.domain.management.DomainManagementMessages.MESSAGES;
-@@ -50,36 +43,49 @@ import static org.jboss.as.domain.management.DomainManagementMessages.MESSAGES;
+ /**
+ * A command line utility to add new users to the mgmt-users.properties files.
+@@ -51,39 +43,49 @@ import org.jboss.sasl.util.UsernamePasswordHashUtil;
*/
public class AddPropertiesUser {
-- private static final String[] badUsernames = {"admin", "administrator", "root"};
+- private static final String[] BAD_USER_NAMES = {"admin", "administrator", "root"};
+ public static final String[] BAD_USER_NAMES = {"admin", "administrator", "root"};
- private static final String DEFAULT_MANAGEMENT_REALM = "ManagementRealm";
@@ -222,13 +161,14 @@ index a52f501..b27c7dd 100644
public static final String APPLICATION_ROLES_PROPERTIES = "application-roles.properties";
public static final String APPLICATION_USERS_SWITCH = "-a";
+- private static final char NEW_LINE_CHAR = '\n';
+ private static final char CARRIAGE_RETURN_CHAR = '\r';
+
- private static final String NEW_LINE = "\n";
- private static final String SPACE = " ";
-+
-+ private static final char CARRIAGE_RETURN_CHAR = '\r';
-+
+ public static final String NEW_LINE = "\n";
+ public static final String SPACE = " ";
++
private static final Properties argsCliProps = new Properties();
- private final Console theConsole = System.console();
@@ -238,12 +178,12 @@ index a52f501..b27c7dd 100644
- private Set<String> knownUsers;
- private State nextState;
+ private ConsoleWrapper theConsole;
-+
-+
-+ protected State nextState;
- private AddPropertiesUser() {
- if (theConsole == null) {
++
++ protected State nextState;
++
+ protected AddPropertiesUser() {
+ theConsole = new JavaConsole();
+ if (theConsole.getConsole() == null) {
@@ -265,7 +205,7 @@ index a52f501..b27c7dd 100644
String valueSilent = argsCliProps.getProperty("silent");
-@@ -87,27 +93,27 @@ public class AddPropertiesUser {
+@@ -91,27 +93,27 @@ public class AddPropertiesUser {
silent = Boolean.valueOf(valueSilent);
}
if (silent) {
@@ -302,13 +242,17 @@ index a52f501..b27c7dd 100644
while ((nextState = nextState.execute()) != null) {
}
}
-@@ -154,488 +160,6 @@ public class AddPropertiesUser {
+@@ -158,538 +160,6 @@ public class AddPropertiesUser {
}
}
-
- private class PropertyFilePrompt implements State {
-
+- private static final int MANAGEMENT = 0;
+- private static final int APPLICATION = 1;
+- private static final int INVALID = 2;
+-
- @Override
- public State execute() {
-
@@ -321,24 +265,25 @@ index a52f501..b27c7dd 100644
- String temp = theConsole.readLine("(a): ");
- if (temp == null) {
- /*
-- * This will return user to the command prompt so add a new line to
-- * ensure the command prompt is on the next line.
+- * This will return user to the command prompt so add a new line to ensure the command prompt is on the next
+- * line.
- */
- theConsole.printf(NEW_LINE);
- return null;
- }
+-
- if (temp.length() > 0) {
-- switch (temp.charAt(0)) {
-- case 'a':
-- case 'A':
+- switch (convertResponse(temp)) {
+- case MANAGEMENT:
- values.management = true;
- values.realm = DEFAULT_MANAGEMENT_REALM;
- return new PropertyFileFinder(values);
-- case 'b':
-- case 'B':
+- case APPLICATION:
- values.management = false;
- values.realm = DEFAULT_APPLICATION_REALM;
- return new PropertyFileFinder(values);
+- default:
+- return new ErrorState(MESSAGES.invalidChoiceResponse(), this);
- }
- } else {
- values.management = true;
@@ -347,10 +292,24 @@ index a52f501..b27c7dd 100644
- }
- }
- }
+-
+- private int convertResponse(final String response) {
+- String temp = response.toLowerCase();
+- if ("A".equals(temp) || "a".equals(temp)) {
+- return MANAGEMENT;
+- }
+-
+- if ("B".equals(temp) || "b".equals(temp)) {
+- return APPLICATION;
+- }
+-
+- return INVALID;
+- }
+-
- }
-
- /**
-- * The first state executed, responsible for searching for the relevent properties files.
+- * The first state executed, responsible for searching for the relevant properties files.
- */
- private class PropertyFileFinder implements State {
-
@@ -550,7 +509,7 @@ index a52f501..b27c7dd 100644
- }
-
- boolean weakUserName = false;
-- for (String current : badUsernames) {
+- for (String current : BAD_USER_NAMES) {
- if (current.equals(values.userName.toLowerCase())) {
- weakUserName = true;
- break;
@@ -728,21 +687,52 @@ index a52f501..b27c7dd 100644
- return null;
- }
-
+- private boolean additionalNewLineNeeded(final File file) throws IOException {
+- FileReader fr = null;
+-
+- try {
+- fr = new FileReader(file);
+- char lastChar = 0x00;
+- char[] temp = new char[1024];
+-
+- int read = -1;
+- while ((read = fr.read(temp)) > 0) {
+- lastChar = temp[read - 1];
+- }
+- /*
+- * It is possible that the final line will also have some whitespace - in that case we want
+- * a new line otherwise the line we add could become indented.
+- *
+- * Depending on where the file was last written the character sequence for a new line can vary,
+- * if we see either of the characters used for a new line as the last character of the last line
+- * we assume a new line is already present in the file.
+- */
+- return lastChar != NEW_LINE_CHAR && lastChar != CARRIAGE_RETURN_CHAR;
+- } finally {
+- safeClose(fr);
+- }
+- }
+-
- private void append(final String entry, final File toFile) throws IOException {
- FileWriter fw = null;
- BufferedWriter bw = null;
-
+- boolean additionalNewLineNeeded = additionalNewLineNeeded(toFile);
+-
- try {
- fw = new FileWriter(toFile, true);
- bw = new BufferedWriter(fw);
-
+- if (additionalNewLineNeeded) {
+- bw.newLine();
+- }
+-
- bw.append(entry);
- bw.newLine();
- } finally {
- safeClose(bw);
- safeClose(fw);
- }
--
- }
- }
-
@@ -791,7 +781,7 @@ index a52f501..b27c7dd 100644
private static void safeClose(Closeable c) {
if (c != null) {
try {
-@@ -645,31 +169,7 @@ public class AddPropertiesUser {
+@@ -699,31 +169,7 @@ public class AddPropertiesUser {
}
}
diff --git a/0042-added-support-for-overriding-the-user-and-roles-prop.patch b/0042-added-support-for-overriding-the-user-and-roles-prop.patch
new file mode 100644
index 0000000..5930beb
--- /dev/null
+++ b/0042-added-support-for-overriding-the-user-and-roles-prop.patch
@@ -0,0 +1,359 @@
+From 0c62c5d389aac0429cf0ed5dc8d54ee5d6b20c8f 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
+ property files for both the standalone and domain
+ server mode. Specify the system property
+ jboss.server.config.user.dir to overriding the
+ location for standalone user files and the property
+ jboss.domain.config.user.dir for overiding the
+ location for domain mode
+
+---
+ build/src/main/resources/bin/add-user.bat | 5 +-
+ build/src/main/resources/bin/add-user.sh | 2 +
+ .../management/security/AddPropertiesUser.java | 20 +++-
+ .../security/state/PropertyFileFinder.java | 21 ++--
+ .../security/state/PropertyFilePrompt.java | 5 +-
+ .../management/security/state/StateValues.java | 9 ++
+ .../security/state/PropertyFileFinderTestCase.java | 123 ++++++++++++++++++++
+ 7 files changed, 166 insertions(+), 19 deletions(-)
+ create mode 100644 domain-management/src/test/java/org/jboss/as/domain/management/security/state/PropertyFileFinderTestCase.java
+
+diff --git a/build/src/main/resources/bin/add-user.bat b/build/src/main/resources/bin/add-user.bat
+index 3e629bc..a72c7f6 100644
+--- a/build/src/main/resources/bin/add-user.bat
++++ b/build/src/main/resources/bin/add-user.bat
+@@ -69,7 +69,10 @@ if "x%JBOSS_MODULEPATH%" == "x" (
+ set "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
+ )
+
+-"%JAVA%" ^
++# Uncomment to override standalone and domain user location
++# set "JAVA_OPTS=%JAVA_OPTS% -Djboss.server.config.user.dir=../standalone/configuration -Djboss.domain.config.user.dir=../domain/configuration"
++
++"%JAVA%" %JAVA_OPTS% ^
+ -jar "%JBOSS_HOME%\jboss-modules.jar" ^
+ -mp "%JBOSS_MODULEPATH%" ^
+ org.jboss.as.domain-add-user ^
+diff --git a/build/src/main/resources/bin/add-user.sh b/build/src/main/resources/bin/add-user.sh
+index dfb0c8b..a4ead41 100755
+--- a/build/src/main/resources/bin/add-user.sh
++++ b/build/src/main/resources/bin/add-user.sh
+@@ -62,6 +62,8 @@ fi
+
+ # Sample JPDA settings for remote socket debugging
+ #JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
++# Uncomment to override standalone and domain user location
++#JAVA_OPTS="$JAVA_OPTS -Djboss.server.config.user.dir=../standalone/configuration -Djboss.domain.config.user.dir=../domain/configuration"
+
+ eval \"$JAVA\" $JAVA_OPTS \
+ -jar \"$JBOSS_HOME/jboss-modules.jar\" \
+diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java b/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
+index f58a799..16bd4bf 100644
+--- a/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
++++ b/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
+@@ -47,8 +47,10 @@ public class AddPropertiesUser {
+
+ public static final String SERVER_BASE_DIR = "jboss.server.base.dir";
+ public static final String SERVER_CONFIG_DIR = "jboss.server.config.dir";
++ public static final String SERVER_CONFIG_USER_DIR = "jboss.server.config.user.dir";
+ public static final String DOMAIN_BASE_DIR = "jboss.domain.base.dir";
+ public static final String DOMAIN_CONFIG_DIR = "jboss.domain.config.dir";
++ public static final String DOMAIN_CONFIG_USER_DIR = "jboss.domain.config.user.dir";
+
+ public static final String DEFAULT_MANAGEMENT_REALM = "ManagementRealm";
+ public static final String DEFAULT_APPLICATION_REALM = "ApplicationRealm";
+@@ -57,6 +59,9 @@ public class AddPropertiesUser {
+ public static final String APPLICATION_ROLES_PROPERTIES = "application-roles.properties";
+ public static final String APPLICATION_USERS_SWITCH = "-a";
+
++ public static final String DOMAIN_CONFIG_DIR_USERS_SWITCH = "-dc";
++ public static final String SERVER_CONFIG_DIR_USERS_SWITCH = "-sc";
++
+ private static final char CARRIAGE_RETURN_CHAR = '\r';
+
+ public static final String NEW_LINE = "\n";
+@@ -72,21 +77,26 @@ public class AddPropertiesUser {
+
+ protected AddPropertiesUser() {
+ theConsole = new JavaConsole();
++ StateValues stateValues = new StateValues();
++ stateValues.setJbossHome(System.getenv("JBOSS_HOME"));
++
+ if (theConsole.getConsole() == null) {
+ throw MESSAGES.noConsoleAvailable();
+ }
+- nextState = new PropertyFilePrompt(theConsole);
++ nextState = new PropertyFilePrompt(theConsole, stateValues);
+ }
+
+ protected AddPropertiesUser(ConsoleWrapper console) {
+ this.theConsole = console;
+- nextState = new PropertyFilePrompt(theConsole);
++ StateValues stateValues = new StateValues();
++ stateValues.setJbossHome(System.getenv("JBOSS_HOME"));
++ nextState = new PropertyFilePrompt(theConsole,stateValues);
+ }
+
+ private AddPropertiesUser(final boolean management, final String user, final char[] password, final String realm) {
+ boolean silent = false;
+ StateValues stateValues = new StateValues();
+-
++ stateValues.setJbossHome(System.getenv("JBOSS_HOME"));
+ String valueSilent = argsCliProps.getProperty("silent");
+
+ if (valueSilent != null) {
+@@ -144,6 +154,10 @@ public class AddPropertiesUser {
+ }
+ } else if (temp.equals(APPLICATION_USERS_SWITCH)) {
+ management = false;
++ } else if (temp.indexOf(DOMAIN_CONFIG_DIR_USERS_SWITCH)>=0) {
++ System.setProperty(DOMAIN_CONFIG_DIR,temp.substring(3));
++ } else if (temp.indexOf(SERVER_CONFIG_DIR)>=0) {
++ System.setProperty(SERVER_CONFIG_DIR,temp.substring(3));
+ } else {
+ argsList.add(temp);
+ }
+diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/security/state/PropertyFileFinder.java b/domain-management/src/main/java/org/jboss/as/domain/management/security/state/PropertyFileFinder.java
+index 22f57f3..82878ee 100644
+--- a/domain-management/src/main/java/org/jboss/as/domain/management/security/state/PropertyFileFinder.java
++++ b/domain-management/src/main/java/org/jboss/as/domain/management/security/state/PropertyFileFinder.java
+@@ -45,15 +45,9 @@ import java.util.List;
+ import java.util.Map;
+ import java.util.Properties;
+ import java.util.Set;
+-import static org.jboss.as.domain.management.security.AddPropertiesUser.MGMT_USERS_PROPERTIES;
+-import static org.jboss.as.domain.management.security.AddPropertiesUser.APPLICATION_USERS_PROPERTIES;
+-import static org.jboss.as.domain.management.security.AddPropertiesUser.APPLICATION_ROLES_PROPERTIES;
+-import static org.jboss.as.domain.management.security.AddPropertiesUser.SERVER_CONFIG_DIR;
+-import static org.jboss.as.domain.management.security.AddPropertiesUser.SERVER_BASE_DIR;
+-import static org.jboss.as.domain.management.security.AddPropertiesUser.DOMAIN_BASE_DIR;
+-import static org.jboss.as.domain.management.security.AddPropertiesUser.DOMAIN_CONFIG_DIR;
+
+ import static org.jboss.as.domain.management.DomainManagementMessages.MESSAGES;
++import static org.jboss.as.domain.management.security.AddPropertiesUser.*;
+
+ /**
+ * The first state executed, responsible for searching for the relevant properties files.
+@@ -74,7 +68,7 @@ public class PropertyFileFinder implements State {
+ @Override
+ public State execute() {
+ stateValues.setKnownRoles(new HashMap<String, String>());
+- String jbossHome = System.getenv("JBOSS_HOME");
++ String jbossHome = stateValues.getJBossHome();
+ if (jbossHome == null) {
+ return new ErrorState(theConsole, MESSAGES.jbossHomeNotSet(), null, stateValues);
+ }
+@@ -134,12 +128,11 @@ public class PropertyFileFinder implements State {
+ }
+
+ private boolean findFiles(final String jbossHome, final List<File> foundFiles, final String fileName) {
+-
+- File standaloneProps = buildFilePath(jbossHome, SERVER_CONFIG_DIR, SERVER_BASE_DIR, "standalone", fileName);
++ File standaloneProps = buildFilePath(jbossHome, SERVER_CONFIG_USER_DIR, SERVER_CONFIG_DIR, SERVER_BASE_DIR, "standalone", fileName);
+ if (standaloneProps.exists()) {
+ foundFiles.add(standaloneProps);
+ }
+- File domainProps = buildFilePath(jbossHome, DOMAIN_CONFIG_DIR, DOMAIN_BASE_DIR, "domain", fileName);
++ File domainProps = buildFilePath(jbossHome, DOMAIN_CONFIG_USER_DIR,DOMAIN_CONFIG_DIR, DOMAIN_BASE_DIR, "domain", fileName);
+ if (domainProps.exists()) {
+ foundFiles.add(domainProps);
+ }
+@@ -150,10 +143,12 @@ public class PropertyFileFinder implements State {
+ return true;
+ }
+
+- private File buildFilePath(final String jbossHome, final String serverConfigDirPropertyName,
++ private File buildFilePath(final String jbossHome, final String serverCofigUserDirPropertyName, final String serverConfigDirPropertyName,
+ final String serverBaseDirPropertyName, final String defaultBaseDir, final String fileName) {
+
+- String configDirConfiguredPath = System.getProperty(serverConfigDirPropertyName);
++ String configUserDirConfiguredPath = System.getProperty(serverCofigUserDirPropertyName);
++ String configDirConfiguredPath = configUserDirConfiguredPath != null ? configUserDirConfiguredPath : System.getProperty(serverConfigDirPropertyName);
++
+ File configDir = configDirConfiguredPath != null ? new File(configDirConfiguredPath) : null;
+ if(configDir == null) {
+ String baseDirConfiguredPath = System.getProperty(serverBaseDirPropertyName);
+diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/security/state/PropertyFilePrompt.java b/domain-management/src/main/java/org/jboss/as/domain/management/security/state/PropertyFilePrompt.java
+index df3bbed..51e91da 100644
+--- a/domain-management/src/main/java/org/jboss/as/domain/management/security/state/PropertyFilePrompt.java
++++ b/domain-management/src/main/java/org/jboss/as/domain/management/security/state/PropertyFilePrompt.java
+@@ -40,9 +40,11 @@ public class PropertyFilePrompt implements State {
+ private static final int INVALID = 2;
+
+ private ConsoleWrapper theConsole;
++ private StateValues stateValues;
+
+- public PropertyFilePrompt(ConsoleWrapper theConsole) {
++ public PropertyFilePrompt(ConsoleWrapper theConsole, StateValues stateValues) {
+ this.theConsole = theConsole;
++ this.stateValues = stateValues;
+ if (theConsole.getConsole() == null) {
+ throw MESSAGES.noConsoleAvailable();
+ }
+@@ -50,7 +52,6 @@ public class PropertyFilePrompt implements State {
+
+ @Override
+ public State execute() {
+- StateValues stateValues = new StateValues();
+
+ theConsole.printf(AddPropertiesUser.NEW_LINE);
+ theConsole.printf(MESSAGES.filePrompt());
+diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/security/state/StateValues.java b/domain-management/src/main/java/org/jboss/as/domain/management/security/state/StateValues.java
+index 27cfdff..a771c57 100644
+--- a/domain-management/src/main/java/org/jboss/as/domain/management/security/state/StateValues.java
++++ b/domain-management/src/main/java/org/jboss/as/domain/management/security/state/StateValues.java
+@@ -46,6 +46,7 @@ public class StateValues {
+ private List<File> roleFiles;
+ private Set<String> knownUsers;
+ private Map<String,String> knownRoles;
++ private String jbossHome;
+
+ public boolean isSilentOrNonInteractive() {
+ return (howInteractive == AddPropertiesUser.Interactiveness.NON_INTERACTIVE) || isSilent();
+@@ -139,4 +140,12 @@ public class StateValues {
+ public void setKnownRoles(Map<String, String> knownRoles) {
+ this.knownRoles = knownRoles;
+ }
++
++ public String getJBossHome() {
++ return this.jbossHome;
++ }
++
++ public void setJbossHome(String path) {
++ this.jbossHome = path;
++ }
+ }
+diff --git a/domain-management/src/test/java/org/jboss/as/domain/management/security/state/PropertyFileFinderTestCase.java b/domain-management/src/test/java/org/jboss/as/domain/management/security/state/PropertyFileFinderTestCase.java
+new file mode 100644
+index 0000000..81689d1
+--- /dev/null
++++ b/domain-management/src/test/java/org/jboss/as/domain/management/security/state/PropertyFileFinderTestCase.java
+@@ -0,0 +1,123 @@
++/*
++ * JBoss, Home of Professional Open Source.
++ * Copyright 2012, 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.
++ */
++
++package org.jboss.as.domain.management.security.state;
++
++import org.jboss.as.domain.management.security.AddPropertiesUser;
++import org.jboss.as.domain.management.security.AssertConsoleBuilder;
++import org.jboss.msc.service.StartException;
++import org.junit.Before;
++import org.junit.Test;
++
++import java.io.BufferedWriter;
++import java.io.File;
++import java.io.FileOutputStream;
++import java.io.IOException;
++import java.io.OutputStreamWriter;
++import java.util.Properties;
++
++import static java.lang.System.getProperty;
++import static org.junit.Assert.assertTrue;
++
++/**
++ * Test the property file finder.
++ *
++ * @author <a href="mailto:flemming.harms at gmail.com">Flemming Harms</a>
++ */
++public class PropertyFileFinderTestCase extends PropertyTestHelper {
++
++
++ @Before
++ public void setup() throws IOException {
++ values.setManagement(true);
++ values.setJbossHome(getProperty("java.io.tmpdir"));
++ }
++
++ private File createPropertyFile(String filename, String mode) throws IOException {
++
++ File domainDir = new File(getProperty("java.io.tmpdir")+File.separator+mode);
++ domainDir.mkdir();
++ domainDir.deleteOnExit();
++ File propertyUserFile = new File(domainDir, filename);
++ propertyUserFile.createNewFile();
++ propertyUserFile.deleteOnExit();
++ BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(propertyUserFile),"UTF8"));
++ try {
++ Properties domainPropeties = new Properties();
++ domainPropeties.setProperty(USER_NAME,"mypassword");
++ domainPropeties.store(bw,"");
++ } finally {
++ bw.close();
++ }
++ return propertyUserFile;
++ }
++
++ @Test
++ public void overridePropertyfileLocationRead() throws IOException {
++ File domainMgmtUserFile = createPropertyFile("mgmt-users.properties", "domain");
++ File standaloneMgmtUserFile = createPropertyFile("mgmt-users.properties", "standalone");
++
++ System.setProperty("jboss.server.config.user.dir", standaloneMgmtUserFile.getParent());
++ System.setProperty("jboss.domain.config.user.dir", domainMgmtUserFile.getParent());
++ State propertyFileFinder = new PropertyFileFinder(consoleMock, values);
++ State nextState = propertyFileFinder.execute();
++ assertTrue(nextState instanceof PromptNewUserState);
++ assertTrue("Expected to find the "+USER_NAME+" in the list of known users",values.getKnownUsers().contains(USER_NAME));
++ assertTrue("Expected the values.getPropertiesFiles() contained the "+standaloneMgmtUserFile.getCanonicalPath(),values.getPropertiesFiles().contains(standaloneMgmtUserFile.getCanonicalFile()));
++ assertTrue("Expected the values.getPropertiesFiles() contained the "+domainMgmtUserFile.getCanonicalPath(),values.getPropertiesFiles().contains(domainMgmtUserFile.getCanonicalFile()));
++ }
++
++ @Test
++ public void overridePropertyfileLocationWrite() throws IOException, StartException {
++ File domainUserFile = createPropertyFile("application-users.properties", "domain");
++ File standaloneUserFile = createPropertyFile("application-users.properties", "standalone");
++ File domainRolesFile = createPropertyFile("application-roles.properties", "domain");
++ File standaloneRolesFile = createPropertyFile("application-roles.properties", "standalone");
++
++ String newUserName = "Hugh.Jackman";
++ values.setRoles(null);
++ values.setUserName(newUserName);
++ values.setManagement(false);
++ System.setProperty("jboss.server.config.user.dir", domainUserFile.getParent());
++ System.setProperty("jboss.domain.config.user.dir", standaloneUserFile.getParent());
++ State propertyFileFinder = new PropertyFileFinder(consoleMock, values);
++ State nextState = propertyFileFinder.execute();
++ assertTrue(nextState instanceof PromptNewUserState);
++
++ File locatedDomainPropertyFile = values.getPropertiesFiles().get(values.getPropertiesFiles().indexOf(domainUserFile));
++ File locatedStandalonePropertyFile = values.getPropertiesFiles().get(values.getPropertiesFiles().indexOf(standaloneUserFile));
++ UpdateUser updateUserState = new UpdateUser(consoleMock, values);
++
++ AssertConsoleBuilder consoleBuilder = new AssertConsoleBuilder().
++ expectedDisplayText(updateUserState.consoleUserMessage(locatedDomainPropertyFile.getCanonicalPath())).
++ expectedDisplayText(AddPropertiesUser.NEW_LINE).
++ expectedDisplayText(updateUserState.consoleUserMessage(locatedStandalonePropertyFile.getCanonicalPath())).
++ expectedDisplayText(AddPropertiesUser.NEW_LINE);
++ consoleMock.setResponses(consoleBuilder);
++ updateUserState.update(values);
++
++ assertUserPropertyFile(newUserName);
++ consoleBuilder.validate();
++ }
++
++
++}
+--
+1.7.10
+
diff --git a/0054-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch b/0043-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
similarity index 95%
rename from 0054-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
rename to 0043-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
index ce74339..794aaca 100644
--- a/0054-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
+++ b/0043-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
@@ -1,12 +1,12 @@
-From fc26329b5109c158a2689b8aca147dbf63bdfc4a Mon Sep 17 00:00:00 2001
+From 3d7337e0800d84cd6c5ff7f5866a1b17e4628ad0 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 54/54] [AS7-4536] add-user.sh mangles permissions of
+Subject: [PATCH 43/43] [AS7-4536] add-user.sh mangles permissions of
mgmt-users.properties
---
.../management/security/PropertiesFileLoader.java | 42 ++++++++++++--------
- 1 files changed, 25 insertions(+), 17 deletions(-)
+ 1 file changed, 25 insertions(+), 17 deletions(-)
diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/security/PropertiesFileLoader.java b/domain-management/src/main/java/org/jboss/as/domain/management/security/PropertiesFileLoader.java
index 38737cb..9c4bad9 100644
@@ -95,5 +95,5 @@ index 38737cb..9c4bad9 100644
try {
c.close();
--
-1.7.7.6
+1.7.10
diff --git a/0024-Removing-some-banned-deps-as-in-Fedora-those-are-jus.patch b/0044-Removing-some-banned-deps-as-in-Fedora-those-are-jus.patch
similarity index 77%
rename from 0024-Removing-some-banned-deps-as-in-Fedora-those-are-jus.patch
rename to 0044-Removing-some-banned-deps-as-in-Fedora-those-are-jus.patch
index 89ef42a..f06a00d 100644
--- a/0024-Removing-some-banned-deps-as-in-Fedora-those-are-jus.patch
+++ b/0044-Removing-some-banned-deps-as-in-Fedora-those-are-jus.patch
@@ -1,18 +1,18 @@
-From 125bf90972be150856c0b043f71f7441125f405f Mon Sep 17 00:00:00 2001
+From 532bb0be93780e3d374ea3fa5c6ead54bc8f73f7 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 24/24] Removing some banned deps as in Fedora those are just
+Subject: [PATCH 44/44] Removing some banned deps as in Fedora those are just
aliases
---
- pom.xml | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ pom.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 3d75c22..f9537bc 100644
+index c45f875..bd0f6e6 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -372,11 +372,11 @@
+@@ -401,10 +401,10 @@
<exclude>com.gwtplatform:gwtp-all</exclude>
<exclude>commons-httpclient:commons-httpclient</exclude>
<exclude>commons-logging:commons-logging</exclude>
@@ -21,13 +21,11 @@ index 3d75c22..f9537bc 100644
<exclude>jacorb:jacorb</exclude>
<exclude>javassist:javassist</exclude>
- <exclude>javax.persistence:persistence-api</exclude>
-- <exclude>javax.servlet:servlet-api</exclude>
+ <!-- <exclude>javax.persistence:persistence-api</exclude> Needs investigation -->
-+ <!-- <exclude>javax.servlet:servlet-api</exclude> Needs investigation -->
+ <exclude>javax.servlet:servlet-api</exclude>
<exclude>javax.transaction:jta</exclude>
<exclude>javax.xml:jaxrpc-api</exclude>
- <exclude>javax.xml.soap:saaj-api</exclude>
-@@ -432,7 +432,7 @@
+@@ -461,7 +461,7 @@
<exclude>sun-jaxb:jaxb-api</exclude>
<exclude>trove:trove</exclude>
<exclude>woodstox:wstx-lgpl</exclude>
@@ -37,5 +35,5 @@ index 3d75c22..f9537bc 100644
</bannedDependencies>
</rules>
--
-1.7.9.1
+1.7.10
diff --git a/0045-Add-org.jboss.as.config-assembly-module.patch b/0045-Add-org.jboss.as.config-assembly-module.patch
new file mode 100644
index 0000000..e10da93
--- /dev/null
+++ b/0045-Add-org.jboss.as.config-assembly-module.patch
@@ -0,0 +1,32 @@
+From ac6b60e759084e852cbca6e4fff48a73c0562be4 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Sat, 21 Apr 2012 07:14:20 +0200
+Subject: [PATCH 45/45] Add org.jboss.as.config-assembly module
+
+---
+ pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index bd0f6e6..084fbd3 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -273,6 +273,7 @@
+ <module>build-config</module>
+ <module>cli</module>
+ <module>clustering</module>
++ <module>config-assembly</module>
+ <module>connector</module>
+ <module>controller</module>
+ <module>controller-client</module>
+@@ -5968,7 +5969,6 @@
+ <module>client/shade</module>
+ <module>cmp</module>
+ <module>configadmin</module>
+- <module>config-assembly</module>
+ <module>dist</module>
+ <module>host-controller</module>
+ <!--
+--
+1.7.10
+
diff --git a/0032-Added-jboss-as-connector-AS7-module.patch b/0046-Added-org.jboss.as.cmp-module.patch
similarity index 52%
copy from 0032-Added-jboss-as-connector-AS7-module.patch
copy to 0046-Added-org.jboss.as.cmp-module.patch
index a959f75..10bd497 100644
--- a/0032-Added-jboss-as-connector-AS7-module.patch
+++ b/0046-Added-org.jboss.as.cmp-module.patch
@@ -1,7 +1,7 @@
-From 1feb0f48ce2bef66da5ab000a9b1b6090d7a4d90 Mon Sep 17 00:00:00 2001
+From f24e54f7ebfca982b470d90fa512a4ec5081f051 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
-Date: Fri, 24 Feb 2012 15:00:04 +0100
-Subject: [PATCH 32/32] Added jboss-as-connector AS7 module
+Date: Mon, 23 Apr 2012 11:59:53 +0200
+Subject: [PATCH 46/46] Added org.jboss.as.cmp module
---
build/build.xml | 8 ++++----
@@ -10,79 +10,79 @@ Subject: [PATCH 32/32] Added jboss-as-connector AS7 module
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 3d903d7..ff67e72 100644
+index f637bb1..e72ecab 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -185,6 +185,10 @@
- <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-jgroups"/>
+@@ -355,6 +355,10 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-web-infinispan"/>
</module-def>
-+ <module-def name="org.jboss.as.connector">
-+ <maven-resource group="org.jboss.as" artifact="jboss-as-connector"/>
++ <module-def name="org.jboss.as.cmp">
++ <maven-resource group="org.jboss.as" artifact="jboss-as-cmp"/>
+ </module-def>
+
- <module-def name="org.jboss.as.controller">
- <maven-resource group="org.jboss.as" artifact="jboss-as-controller"/>
+ <module-def name="org.jboss.as.connector">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-connector"/>
</module-def>
-@@ -807,10 +811,6 @@
- <maven-resource group="org.jboss.as" artifact="jboss-as-cmp"/>
+@@ -926,10 +930,6 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-configadmin"/>
</module-def>
-- <module-def name="org.jboss.as.connector">
-- <maven-resource group="org.jboss.as" artifact="jboss-as-connector"/>
+- <module-def name="org.jboss.as.cmp">
+- <maven-resource group="org.jboss.as" artifact="jboss-as-cmp"/>
- </module-def>
-
- <module-def name="org.jboss.as.deployment-scanner">
- <maven-resource group="org.jboss.as" artifact="jboss-as-deployment-scanner"/>
+ <module-def name="org.jboss.as.host-controller">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-host-controller"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 1591537..3249ef0 100644
+index 6fc687f..09d0880 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -141,6 +141,11 @@
+@@ -268,6 +268,11 @@
+ </dependency>
<dependency>
- <groupId>org.jboss.as</groupId>
-+ <artifactId>jboss-as-connector</artifactId>
++ <groupId>org.jboss.as</groupId>
++ <artifactId>jboss-as-cmp</artifactId>
+ </dependency>
+
+ <dependency>
-+ <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-domain-http-error-context</artifactId>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-connector</artifactId>
</dependency>
-
-@@ -884,11 +889,6 @@
+@@ -1145,11 +1150,6 @@
+ </dependency>
<dependency>
- <groupId>org.jboss.as</groupId>
-- <artifactId>jboss-as-connector</artifactId>
+- <groupId>org.jboss.as</groupId>
+- <artifactId>jboss-as-cmp</artifactId>
- </dependency>
-
- <dependency>
-- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-controller</artifactId>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-configadmin</artifactId>
</dependency>
-
diff --git a/pom.xml b/pom.xml
-index f9537bc..861ec88 100644
+index 084fbd3..c6efadd 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -266,6 +266,7 @@
- <module>build</module>
+@@ -273,6 +273,7 @@
<module>build-config</module>
+ <module>cli</module>
<module>clustering</module>
-+ <module>connector</module>
++ <module>cmp</module>
+ <module>config-assembly</module>
+ <module>connector</module>
<module>controller</module>
- <module>controller-client</module>
- <module>deployment-repository</module>
-@@ -5921,7 +5922,6 @@
+@@ -5967,7 +5968,6 @@
+ <module>client/ejb</module>
+ <module>client/jms</module>
<module>client/shade</module>
- <module>cmp</module>
+- <module>cmp</module>
<module>configadmin</module>
-- <module>connector</module>
- <module>demos</module>
- <module>deployment-scanner</module>
<module>dist</module>
+ <module>host-controller</module>
--
-1.7.9.1
+1.7.10
diff --git a/0047-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch b/0047-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
new file mode 100644
index 0000000..0223ce8
--- /dev/null
+++ b/0047-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
@@ -0,0 +1,144 @@
+From e14b89117c2a979fb90f8231cf44975ce0afd9c0 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.
+
+The JBossQL en EJBQL grammars used for CMP use some tokens with
+empty regular expressions. This worked with JavaCC 4 but doesn't
+with version 5.
+
+This patch creates a DUMMY lexical state that will never be
+reached and puts those tokens inside with a non empty regular
+expression (that will never be matched).
+---
+ .../jjtree/org/jboss/as/cmp/ejbql/EJBQLParser.jjt | 37 +++++++++----------
+ .../org/jboss/as/cmp/ejbql/JBossQLParser.jjt | 38 ++++++++++----------
+ 2 files changed, 38 insertions(+), 37 deletions(-)
+
+diff --git a/cmp/src/main/jjtree/org/jboss/as/cmp/ejbql/EJBQLParser.jjt b/cmp/src/main/jjtree/org/jboss/as/cmp/ejbql/EJBQLParser.jjt
+index 7f338d4..6f1afd8 100644
+--- a/cmp/src/main/jjtree/org/jboss/as/cmp/ejbql/EJBQLParser.jjt
++++ b/cmp/src/main/jjtree/org/jboss/as/cmp/ejbql/EJBQLParser.jjt
+@@ -1067,10 +1067,6 @@ TOKEN_MGR_DECLS :
+ }
+ }
+ |
+- < ABSTRACT_SCHEMA: [] >
+-|
+- < IDENTIFICATION_VARIABLE: [] >
+-|
+ < #NAME: <LETTER> (<LETTER>|<DIGIT>)* >
+ |
+ < #LETTER:
+@@ -1149,12 +1145,6 @@ TOKEN_MGR_DECLS :
+ }
+ }
+ }
+-| < NUMERIC_VALUED_PARAMETER: [] >
+-| < STRING_VALUED_PARAMETER: [] >
+-| < DATETIME_VALUED_PARAMETER: [] >
+-| < BOOLEAN_VALUED_PARAMETER: [] >
+-| < ENTITY_VALUED_PARAMETER: [] >
+-| < VALUE_CLASS_VALUED_PARAMETER: [] >
+ }
+
+ /**
+@@ -1222,14 +1212,25 @@ TOKEN_MGR_DECLS :
+ idManager.registerPath(matchedToken.image, pathList, fieldList);
+ resetPath();
+ } : DEFAULT
+-| < NUMERIC_VALUED_PATH: [] >
+-| < STRING_VALUED_PATH: [] >
+-| < DATETIME_VALUED_PATH: [] >
+-| < BOOLEAN_VALUED_PATH: [] >
+-| < ENTITY_VALUED_PATH: [] >
+-| < VALUE_CLASS_VALUED_PATH: [] >
+-| < UNKNOWN_PATH: [] >
+-| < COLLECTION_VALUED_PATH: [] >
+ }
+
++<DUMMY> TOKEN:
++{
++ < ABSTRACT_SCHEMA: "ABSTRACT_SCHEMA" >
++| < IDENTIFICATION_VARIABLE: "IDENTIFICATION_VARIABLE" >
++| < NUMERIC_VALUED_PARAMETER: "NUMERIC_VALUED_PARAMETER" >
++| < STRING_VALUED_PARAMETER: "STRING_VALUED_PARAMETER" >
++| < DATETIME_VALUED_PARAMETER: "DATETIME_VALUED_PARAMETER" >
++| < BOOLEAN_VALUED_PARAMETER: "BOOLEAN_VALUED_PARAMETER" >
++| < ENTITY_VALUED_PARAMETER: "ENTITY_VALUED_PARAMETER" >
++| < VALUE_CLASS_VALUED_PARAMETER: "VALUE_CLASS_VALUED_PARAMETER" >
++| < NUMERIC_VALUED_PATH: "NUMERIC_VALUED_PATH" >
++| < STRING_VALUED_PATH: "STRING_VALUED_PATH" >
++| < DATETIME_VALUED_PATH: "DATETIME_VALUED_PATH" >
++| < BOOLEAN_VALUED_PATH: "BOOLEAN_VALUED_PATH" >
++| < ENTITY_VALUED_PATH: "ENTITY_VALUED_PATH" >
++| < VALUE_CLASS_VALUED_PATH: "VALUE_CLASS_VALUED_PATH" >
++| < UNKNOWN_PATH: "UNKNOWN_PATH" >
++| < COLLECTION_VALUED_PATH: "COLLECTION_VALUED_PATH" >
++}
+
+diff --git a/cmp/src/main/jjtree/org/jboss/as/cmp/ejbql/JBossQLParser.jjt b/cmp/src/main/jjtree/org/jboss/as/cmp/ejbql/JBossQLParser.jjt
+index 116f86b..51f996f 100644
+--- a/cmp/src/main/jjtree/org/jboss/as/cmp/ejbql/JBossQLParser.jjt
++++ b/cmp/src/main/jjtree/org/jboss/as/cmp/ejbql/JBossQLParser.jjt
+@@ -1163,10 +1163,6 @@ TOKEN_MGR_DECLS :
+ }
+ }
+ |
+- < ABSTRACT_SCHEMA: [] >
+-|
+- < IDENTIFICATION_VARIABLE: [] >
+-|
+ < #NAME: <LETTER> (<LETTER>|<DIGIT>)* >
+ |
+ < #LETTER:
+@@ -1245,12 +1241,6 @@ TOKEN_MGR_DECLS :
+ }
+ }
+ }
+-| < NUMERIC_VALUED_PARAMETER: [] >
+-| < STRING_VALUED_PARAMETER: [] >
+-| < DATETIME_VALUED_PARAMETER: [] >
+-| < BOOLEAN_VALUED_PARAMETER: [] >
+-| < ENTITY_VALUED_PARAMETER: [] >
+-| < VALUE_CLASS_VALUED_PARAMETER: [] >
+ }
+
+ /**
+@@ -1318,14 +1308,24 @@ TOKEN_MGR_DECLS :
+ idManager.registerPath(matchedToken.image, pathList, fieldList);
+ resetPath();
+ } : DEFAULT
+-| < NUMERIC_VALUED_PATH: [] >
+-| < STRING_VALUED_PATH: [] >
+-| < DATETIME_VALUED_PATH: [] >
+-| < BOOLEAN_VALUED_PATH: [] >
+-| < ENTITY_VALUED_PATH: [] >
+-| < VALUE_CLASS_VALUED_PATH: [] >
+-| < UNKNOWN_PATH: [] >
+-| < COLLECTION_VALUED_PATH: [] >
+ }
+
+-
++<DUMMY> TOKEN :
++{
++ < ABSTRACT_SCHEMA: "ABSTRACT_SCHEMA:" >
++| < IDENTIFICATION_VARIABLE: "IDENTIFICATION_VARIABLE" >
++| < NUMERIC_VALUED_PARAMETER: "NUMERIC_VALUED_PARAMETER" >
++| < STRING_VALUED_PARAMETER: "STRING_VALUED_PARAMETER" >
++| < DATETIME_VALUED_PARAMETER: "DATETIME_VALUED_PARAMETER" >
++| < BOOLEAN_VALUED_PARAMETER: "BOOLEAN_VALUED_PARAMETER" >
++| < ENTITY_VALUED_PARAMETER: "ENTITY_VALUED_PARAMETER" >
++| < VALUE_CLASS_VALUED_PARAMETER: "VALUE_CLASS_VALUED_PARAMETER" >
++| < NUMERIC_VALUED_PATH: "NUMERIC_VALUED_PATH" >
++| < STRING_VALUED_PATH: "STRING_VALUED_PATH" >
++| < DATETIME_VALUED_PATH: "DATETIME_VALUED_PATH" >
++| < BOOLEAN_VALUED_PATH: "BOOLEAN_VALUED_PATH" >
++| < ENTITY_VALUED_PATH: "ENTITY_VALUED_PATH" >
++| < VALUE_CLASS_VALUED_PATH: "VALUE_CLASS_VALUED_PATH" >
++| < UNKNOWN_PATH: "UNKNOWN_PATH" >
++| < COLLECTION_VALUED_PATH: "COLLECTION_VALUED_PATH" >
++}
+--
+1.7.10
+
diff --git a/0032-Added-jboss-as-connector-AS7-module.patch b/0048-Added-org.jboss.as.configadmin-module.patch
similarity index 51%
rename from 0032-Added-jboss-as-connector-AS7-module.patch
rename to 0048-Added-org.jboss.as.configadmin-module.patch
index a959f75..7ef0339 100644
--- a/0032-Added-jboss-as-connector-AS7-module.patch
+++ b/0048-Added-org.jboss.as.configadmin-module.patch
@@ -1,7 +1,7 @@
-From 1feb0f48ce2bef66da5ab000a9b1b6090d7a4d90 Mon Sep 17 00:00:00 2001
+From 9ac311915b2228ef53c4915f712dfe2f0d0f17bc Mon Sep 17 00:00:00 2001
From: Marek Goldmann <mgoldman at redhat.com>
-Date: Fri, 24 Feb 2012 15:00:04 +0100
-Subject: [PATCH 32/32] Added jboss-as-connector AS7 module
+Date: Mon, 23 Apr 2012 13:06:45 +0200
+Subject: [PATCH 48/48] Added org.jboss.as.configadmin module
---
build/build.xml | 8 ++++----
@@ -10,79 +10,79 @@ Subject: [PATCH 32/32] Added jboss-as-connector AS7 module
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/build/build.xml b/build/build.xml
-index 3d903d7..ff67e72 100644
+index e72ecab..67dfeef 100644
--- a/build/build.xml
+++ b/build/build.xml
-@@ -185,6 +185,10 @@
- <maven-resource group="org.jboss.as" artifact="jboss-as-clustering-jgroups"/>
+@@ -359,6 +359,10 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-cmp"/>
</module-def>
-+ <module-def name="org.jboss.as.connector">
-+ <maven-resource group="org.jboss.as" artifact="jboss-as-connector"/>
++ <module-def name="org.jboss.as.configadmin">
++ <maven-resource group="org.jboss.as" artifact="jboss-as-configadmin"/>
+ </module-def>
+
- <module-def name="org.jboss.as.controller">
- <maven-resource group="org.jboss.as" artifact="jboss-as-controller"/>
+ <module-def name="org.jboss.as.connector">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-connector"/>
</module-def>
-@@ -807,10 +811,6 @@
- <maven-resource group="org.jboss.as" artifact="jboss-as-cmp"/>
+@@ -926,10 +930,6 @@
+ <maven-resource-with-classifier group="org.jboss.as" artifact="jboss-as-console" classifier="resources"/>
</module-def>
-- <module-def name="org.jboss.as.connector">
-- <maven-resource group="org.jboss.as" artifact="jboss-as-connector"/>
+- <module-def name="org.jboss.as.configadmin">
+- <maven-resource group="org.jboss.as" artifact="jboss-as-configadmin"/>
- </module-def>
-
- <module-def name="org.jboss.as.deployment-scanner">
- <maven-resource group="org.jboss.as" artifact="jboss-as-deployment-scanner"/>
+ <module-def name="org.jboss.as.host-controller">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-host-controller"/>
</module-def>
diff --git a/build/pom.xml b/build/pom.xml
-index 1591537..3249ef0 100644
+index 09d0880..91d967a 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -141,6 +141,11 @@
+@@ -274,6 +274,11 @@
<dependency>
<groupId>org.jboss.as</groupId>
-+ <artifactId>jboss-as-connector</artifactId>
++ <artifactId>jboss-as-configadmin</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-domain-http-error-context</artifactId>
+ <artifactId>jboss-as-connector</artifactId>
</dependency>
-@@ -884,11 +889,6 @@
+@@ -1151,11 +1156,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
-- <artifactId>jboss-as-connector</artifactId>
+- <artifactId>jboss-as-configadmin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-controller</artifactId>
+ <artifactId>jboss-as-console</artifactId>
+ <classifier>resources</classifier>
</dependency>
-
diff --git a/pom.xml b/pom.xml
-index f9537bc..861ec88 100644
+index c6efadd..e337139 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -266,6 +266,7 @@
- <module>build</module>
- <module>build-config</module>
+@@ -275,6 +275,7 @@
<module>clustering</module>
-+ <module>connector</module>
+ <module>cmp</module>
+ <module>config-assembly</module>
++ <module>configadmin</module>
+ <module>connector</module>
<module>controller</module>
<module>controller-client</module>
- <module>deployment-repository</module>
-@@ -5921,7 +5922,6 @@
+@@ -5968,7 +5969,6 @@
+ <module>client/ejb</module>
+ <module>client/jms</module>
<module>client/shade</module>
- <module>cmp</module>
- <module>configadmin</module>
-- <module>connector</module>
- <module>demos</module>
- <module>deployment-scanner</module>
+- <module>configadmin</module>
<module>dist</module>
+ <module>host-controller</module>
+ <!--
--
-1.7.9.1
+1.7.10
diff --git a/jboss-as-cp.sh b/jboss-as-cp.sh
index c8d1e18..d8badc1 100755
--- a/jboss-as-cp.sh
+++ b/jboss-as-cp.sh
@@ -55,5 +55,5 @@ cp $JBOSS_HOME/docs/examples/properties/mgmt-users.properties ${LOCATION}/config
# Make sure the mgmt-users.properties file has correct permissions!
chmod 600 ${LOCATION}/configuration/mgmt-users.properties
-echo -e "Directory ${LOCATION} ws prepared to launch JBoss AS!\n\nYou can now boot your server: JBOSS_BASE_DIR=${LOCATION} ${JBOSS_HOME}/bin/standalone.sh -c ${STANDALONE_XML}"
+echo -e "Directory ${LOCATION} is prepared to launch JBoss AS!\n\nYou can now boot your server: JBOSS_BASE_DIR=${LOCATION} ${JBOSS_HOME}/bin/standalone.sh -c ${STANDALONE_XML}"
diff --git a/jboss-as.spec b/jboss-as.spec
index 144be4a..4512bb4 100644
--- a/jboss-as.spec
+++ b/jboss-as.spec
@@ -11,80 +11,72 @@
%global jbuid 185
-%global modules cli connector controller-client controller deployment-repository deployment-scanner domain-management ee ejb3 embedded jmx logging naming network platform-mbean process-controller protocol remoting security server threads transactions web weld
+%global modules cli cmp connector controller-client controller deployment-repository deployment-scanner domain-management ee ejb3 embedded jmx logging naming network platform-mbean process-controller protocol remoting security server threads transactions web weld
Name: jboss-as
-Version: 7.1.0
-Release: 4%{?dist}
+Version: 7.1.1
+Release: 1%{?dist}
Summary: JBoss Application Server
Group: System Environment/Daemons
License: LGPLv2 and ASL 2.0
URL: http://www.jboss.org/jbossas
# git clone git://github.com/jbossas/jboss-as.git
-# cd jboss-as && git checkout 7.1.0.Final && git checkout-index -f -a --prefix=jboss-as-7.1.0.Final/
-# find jboss-as-7.1.0.Final/ -name '*.jar' -type f -delete
-# tar -cJf jboss-as-7.1.0.Final-CLEAN.tar.xz jboss-as-7.1.0.Final
+# cd jboss-as && git checkout 7.1.1.Final && git checkout-index -f -a --prefix=jboss-as-7.1.1.Final/
+# find jboss-as-7.1.1.Final/ -name '*.jar' -type f -delete
+# tar -cJf jboss-as-7.1.1.Final-CLEAN.tar.xz jboss-as-7.1.1.Final
Source0: jboss-as-%{namedversion}-CLEAN.tar.xz
# Makes possible to run JBoss AS in different directory by creating the structure and copying required configuration files
Source1: jboss-as-cp.sh
-Patch0: 0001-Disable-checkstyle.patch
-Patch1: 0002-Fix-initd-script.patch
-Patch2: 0003-Build-additional-modules.patch
-# Modifications here are purely temporary until we solve issues in the Right Way (tm)
-#Patch3: 0004-Ugly-patch-nuff-said.patch
+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-Only-copy-schemas-and-create-client-all-jar-on-norma.patch
-Patch7: 0008-Make-the-dependency-on-dom4j-optional.patch
-Patch8: 0009-AS7-3724-DO-NOT-UPSTREAM-an-ugly-patch-to-remove-IIO.patch
-Patch9: 0010-adding-org.jboss.metadata-to-minimal-build.patch
-Patch10: 0011-adding-org.jboss.ejb3-module-to-minimal-build.patch
-Patch11: 0012-adding-org.jboss.as.logging.patch
-Patch12: 0013-Removing-logging-module-from-the-normal-profile-as-i.patch
-Patch13: 0014-making-the-dependency-in-javax.xml.ws.api-optional-i.patch
-Patch14: 0015-adding-org.hibernate.validator.patch
-Patch15: 0016-adding-org.jboss.remote-naming-to-minimal-build.patch
-Patch16: 0017-Enable-org.jboss.as.transactions-module.patch
-Patch17: 0018-Removing-use-of-HornetqJournalEnvironmentBean-in-Arj.patch
-Patch18: 0019-adding-org.jboss.jboss-transaction-spi-to-minimal-bu.patch
-Patch19: 0020-adding-jts-modules-to-minimal-build.patch
-Patch20: 0021-adding-org.omg.api-to-minimal-build.patch
-Patch21: 0022-Enable-org.jboss.as.security-module.patch
-Patch22: 0023-Enable-part-of-org.jboss.as.clustering-module-infini.patch
-Patch23: 0024-Removing-some-banned-deps-as-in-Fedora-those-are-jus.patch
-Patch24: 0025-Add-jgroups-module.patch
-Patch25: 0026-Add-infinispan-modules.patch
-Patch26: 0027-Added-jboss-jacc-api-module.patch
-Patch27: 0028-Added-javax.servlet.api-module.patch
-Patch28: 0029-Added-org.jboss.security.negotiation-module.patch
-Patch29: 0030-Added-org.picketbox-module.patch
-Patch30: 0031-Added-sun.jdk-module.patch
-Patch31: 0032-Added-jboss-as-connector-AS7-module.patch
-Patch32: 0033-Added-jboss-as-web-jboss-as-clustering-api-jboss-as-.patch
-Patch33: 0034-Added-net.jcip-org.jboss.ironjacamar-javax.resource..patch
-Patch34: 0035-Make-some-modules-optional.patch
-Patch35: 0036-Added-jboss-as-ejb3-jboss-as-weld-jboss-as-jpa-modul.patch
-Patch36: 0037-Exludes-cleanup.patch
-Patch37: 0038-Added-additional-modules-required-on-runtime.patch
-Patch38: 0039-Enabled-rest-of-clustering-submodules.patch
-Patch39: 0040-Fixed-remoting-jmx-gid-reverting-rmi-changes-adding-.patch
-Patch40: 0041-AS7-3921-Upgrade-to-Remoting-JMX-1.0.2-including-swi.patch
-Patch41: 0042-Added-standalone-web.xml-example-configuration.-Use-.patch
-Patch42: 0043-Add-systemd-files-re-arrange-directory-with-init-scr.patch
-Patch43: 0044-Fixed-systemd-service-file.patch
-Patch44: 0045-Added-jboss-as-cli-module.patch
-Patch45: 0046-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
-Patch46: 0047-Simplified-systemd-files.patch
-Patch47: 0048-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
-Patch48: 0049-Added-domain-add-user-module.patch
-Patch49: 0050-Discard-logs-from-systemd-service-we-don-t-need-dupl.patch
-Patch50: 0051-Changed-the-systemd-config-file-location-we-want-to-.patch
-Patch51: 0052-Remove-activation-module.patch
-Patch52: 0053-Use-properties-in-add-user-AS7-module.patch
-Patch53: 0054-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.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
BuildArch: noarch
@@ -164,6 +156,7 @@ BuildRequires: jboss-vfs >= 3.1.0-1
BuildRequires: jbossws-api
BuildRequires: jcip-annotations
BuildRequires: jline
+BuildRequires: jul-to-slf4j-stub
BuildRequires: joda-time
BuildRequires: jpackage-utils
BuildRequires: maven
@@ -172,6 +165,7 @@ BuildRequires: maven-checkstyle-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-dependency-plugin
+BuildRequires: javacc-maven-plugin
BuildRequires: mojarra
BuildRequires: picketbox
BuildRequires: picketbox-commons
@@ -257,6 +251,7 @@ Requires: jbossws-api
Requires: jcip-annotations
Requires: jgroups
Requires: jline
+Requires: jul-to-slf4j-stub
Requires: joda-time
Requires: jpackage-utils
Requires: mojarra
@@ -293,7 +288,7 @@ This package contains the API documentation for %{name}.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-#%patch3 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -337,13 +332,6 @@ This package contains the API documentation for %{name}.
%patch44 -p1
%patch45 -p1
%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
%build
# We don't have packaged all test dependencies (jboss-test for example)
@@ -605,6 +593,7 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath jboss-web) org/jboss/as/web/main/jboss-web.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 mojarra/jsf-impl) com/sun/jsf-impl/main/jsf-impl.jar
@@ -646,6 +635,7 @@ exit 0
%dir %{bindir}
%{bindir}/*.conf
%{bindir}/*.sh
+%{bindir}/*.xml
%{_bindir}
%{homedir}/auth
%{homedir}/domain
@@ -683,8 +673,9 @@ exit 0
%doc %{homedir}/LICENSE.txt
%changelog
-* Tue Apr 17 2012 Marek Goldmann <mgoldman at redhat.com> 7.1.0-4
-- [AS7-4536] add-user.sh mangles permissions of mgmt-users.properties
+* Fri Apr 20 2012 Marek Goldmann <mgoldman at redhat.com> 7.1.1-1
+- Upstream release 7.1.1.Final
+- Added jboss-as-cmp module
* Mon Apr 16 2012 Marek Goldmann <mgoldman at redhat.com> 7.1.0-3
- Simplified systemd files
diff --git a/sources b/sources
index b7000ae..6d4779a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf0e1b69e6eff14d9b1fd47319b05847 jboss-as-7.1.0.Final-CLEAN.tar.xz
+46a43cd9c50c3cb2995548b02371e91e jboss-as-7.1.1.Final-CLEAN.tar.xz
More information about the scm-commits
mailing list