[jboss-as] Added org.jboss.as.modcluster module

Marek Goldmann goldmann at fedoraproject.org
Wed Jul 4 08:57:09 UTC 2012


commit 2ef7822c2dab0078cd7916f742aaef39d4daf453
Author: Marek Goldmann <mgoldman at redhat.com>
Date:   Tue Jun 5 12:41:20 2012 +0200

    Added org.jboss.as.modcluster module

 0062-Added-org.jboss.as.modcluster-module.patch |  109 +++++++++++++++++++++++
 jboss-as.spec                                   |   17 +++-
 2 files changed, 122 insertions(+), 4 deletions(-)
---
diff --git a/0062-Added-org.jboss.as.modcluster-module.patch b/0062-Added-org.jboss.as.modcluster-module.patch
new file mode 100644
index 0000000..1305ad7
--- /dev/null
+++ b/0062-Added-org.jboss.as.modcluster-module.patch
@@ -0,0 +1,109 @@
+From d61882a145903429898fcc2d85b1e8300282719f Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Tue, 5 Jun 2012 10:50:15 +0200
+Subject: [PATCH 62/62] Added org.jboss.as.modcluster module
+
+---
+ build/build.xml                                        |   16 ++++++++--------
+ build/pom.xml                                          |   10 +++++-----
+ .../jboss/as/modcluster/ModClusterSubsystemAdd.java    |    1 -
+ pom.xml                                                |    2 +-
+ 4 files changed, 14 insertions(+), 15 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 77aa728..dc1502e 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -490,6 +490,14 @@
+             <maven-resource group="org.jboss.as" artifact="jboss-as-messaging"/>
+         </module-def>
+ 
++        <module-def name="org.jboss.as.modcluster">
++            <maven-resource group="org.jboss.as" artifact="jboss-as-modcluster"/>
++            <maven-resource group="org.jboss.mod_cluster" artifact="mod_cluster-container-spi"/>
++            <maven-resource group="org.jboss.mod_cluster" artifact="mod_cluster-core"/>
++            <maven-resource group="org.jboss.mod_cluster" artifact="mod_cluster-container-catalina"/>
++            <maven-resource group="org.jboss.mod_cluster" artifact="mod_cluster-container-jbossweb"/>
++        </module-def>
++
+         <module-def name="org.jboss.as.network">
+             <maven-resource group="org.jboss.as" artifact="jboss-as-network"/>
+         </module-def>
+@@ -1038,14 +1046,6 @@
+             <maven-resource group="org.jboss.as" artifact="jboss-as-jpa-openjpa"/>
+         </module-def>
+ 
+-        <module-def name="org.jboss.as.modcluster">
+-            <maven-resource group="org.jboss.as" artifact="jboss-as-modcluster"/>
+-            <maven-resource group="org.jboss.mod_cluster" artifact="mod_cluster-container-spi"/>
+-            <maven-resource group="org.jboss.mod_cluster" artifact="mod_cluster-core"/>
+-            <maven-resource group="org.jboss.mod_cluster" artifact="mod_cluster-container-catalina"/>
+-            <maven-resource group="org.jboss.mod_cluster" artifact="mod_cluster-container-jbossweb"/>
+-        </module-def>
+-
+      	<module-def name="org.jboss.as.osgi">
+             <maven-resource group="org.jboss.as" artifact="jboss-as-osgi-service"/>
+         </module-def>
+diff --git a/build/pom.xml b/build/pom.xml
+index 42a664c..1389c25 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -409,6 +409,11 @@
+ 
+         <dependency>
+             <groupId>org.jboss.as</groupId>
++            <artifactId>jboss-as-modcluster</artifactId>
++        </dependency>
++
++        <dependency>
++            <groupId>org.jboss.as</groupId>
+             <artifactId>jboss-as-naming</artifactId>
+         </dependency>
+ 
+@@ -1289,11 +1294,6 @@
+ 
+                 <dependency>
+                     <groupId>org.jboss.as</groupId>
+-                    <artifactId>jboss-as-modcluster</artifactId>
+-                </dependency>
+-
+-                <dependency>
+-                    <groupId>org.jboss.as</groupId>
+                     <artifactId>jboss-as-osgi-configadmin</artifactId>
+                 </dependency>
+ 
+diff --git a/modcluster/src/main/java/org/jboss/as/modcluster/ModClusterSubsystemAdd.java b/modcluster/src/main/java/org/jboss/as/modcluster/ModClusterSubsystemAdd.java
+index 71cdff4..b00b073 100644
+--- a/modcluster/src/main/java/org/jboss/as/modcluster/ModClusterSubsystemAdd.java
++++ b/modcluster/src/main/java/org/jboss/as/modcluster/ModClusterSubsystemAdd.java
+@@ -46,7 +46,6 @@ import org.jboss.modcluster.config.impl.ModClusterConfig;
+ import org.jboss.msc.service.ServiceBuilder;
+ import org.jboss.msc.service.ServiceController;
+ import org.jboss.msc.service.ServiceController.Mode;
+-import org.omg.CosCollection.Command;
+ 
+ /**
+  * The managed subsystem add update.
+diff --git a/pom.xml b/pom.xml
+index 2719095..fa79681 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -296,6 +296,7 @@
+         <module>logging</module>
+         <module>mail</module>
+         <module>messaging</module>
++        <module>modcluster</module>
+         <module>naming</module>
+         <module>network</module>
+         <module>platform-mbean</module>
+@@ -5982,7 +5983,6 @@
+                 -->
+                 <module>jdr</module>
+                 <module>jsr77</module>
+-                <module>modcluster</module>
+                 <module>osgi</module>
+                 <module>remoting-test</module>
+                 <module>spec-api</module>
+-- 
+1.7.10.2
+
diff --git a/jboss-as.spec b/jboss-as.spec
index 96b2d68..bbc9c8d 100644
--- a/jboss-as.spec
+++ b/jboss-as.spec
@@ -12,7 +12,7 @@
 %global jbuid 185
 
 # Enabled modules:
-%global modules cli cmp connector controller-client controller deployment-repository deployment-scanner domain-management ee ejb3 embedded host-controller jaxr jaxrs jmx logging management-client-content mail naming network platform-mbean pojo process-controller protocol remoting sar security server threads transactions web weld
+%global modules cli cmp connector controller-client controller deployment-repository deployment-scanner domain-management ee ejb3 embedded host-controller jaxr jaxrs jmx logging management-client-content mail modcluster naming network platform-mbean pojo process-controller protocol remoting sar security server threads transactions web weld
 
 # Additional modules enabled, but not listed above because of different structure:
 # clustering
@@ -95,6 +95,7 @@ Patch57:          0058-Enabled-org.jboss.spec.javax.ws.rs-module.patch
 Patch58:          0059-Added-org.jboss.as.jaxr-module.patch
 Patch59:          0060-Added-org.jboss.as.messaging-module.patch
 Patch60:          0061-Runtime-dependencies.patch
+Patch61:          0062-Added-org.jboss.as.modcluster-module.patch
 
 BuildArch:        noarch
 
@@ -125,6 +126,7 @@ BuildRequires:    infinispan
 BuildRequires:    ironjacamar
 BuildRequires:    jandex
 BuildRequires:    java-devel >= 1:1.7.0
+BuildRequires:    javacc-maven-plugin
 BuildRequires:    javamail
 BuildRequires:    javassist
 BuildRequires:    jgroups
@@ -191,9 +193,9 @@ BuildRequires:    maven-checkstyle-plugin
 BuildRequires:    maven-resources-plugin
 BuildRequires:    maven-surefire-plugin
 BuildRequires:    maven-dependency-plugin
-BuildRequires:    netty
-BuildRequires:    javacc-maven-plugin
 BuildRequires:    mojarra
+BuildRequires:    mod_cluster-java >= 1.2.1-2
+BuildRequires:    netty
 BuildRequires:    picketbox
 BuildRequires:    picketbox-commons
 BuildRequires:    resteasy >= 2.3.2-7
@@ -291,6 +293,7 @@ Requires:         jul-to-slf4j-stub
 Requires:         joda-time
 Requires:         jpackage-utils
 Requires:         mojarra
+Requires:         mod_cluster-java >= 1.2.1-2
 Requires:         netty
 Requires:         openssl
 Requires:         picketbox
@@ -334,7 +337,7 @@ git commit -a -q -m "%{version} baseline."
 git am %{patches}
 
 %build
-export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m"
+export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=384m"
 
 # We don't have packaged all test dependencies (jboss-test for example)
 mvn-rpmbuild -Dmaven.test.skip=true -Dminimalistic -e install javadoc:aggregate
@@ -614,6 +617,11 @@ pushd $RPM_BUILD_ROOT%{homedir}
     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
+
+    for m in container-catalina container-jbossweb container-spi core; do
+      ln -s $(build-classpath mod_cluster/${m}) org/jboss/as/modcluster/main/${m}.jar
+    done
+
     ln -s $(build-classpath netty) org/jboss/netty/main/netty.jar
     ln -s $(build-classpath picketbox/picketbox) org/picketbox/main/picketbox.jar
     ln -s $(build-classpath picketbox/infinispan) org/picketbox/main/infinispan.jar
@@ -731,6 +739,7 @@ rm -rf %{homedir}/modules/org/hornetq/main/lib/linux-${arch}/*
 - jboss-as-cp script is missing argument placeholder for c optarg, RHBZ#827571
 - Create a startup script when creating a new user instance (jboss-as-cp), RHBZ#827588
 - The user instance create script (jboss-as-cp) should allow a port offset to be specified, RHBZ#827589
+- Added org.jboss.as.modcluster module
 
 * Fri May 11 2012 Marek Goldmann <mgoldman at redhat.com> 7.1.1-3
 - Changed the way we apply patches at build time


More information about the scm-commits mailing list