[jboss-as] Added org.jboss.as.jsr77 module
Marek Goldmann
goldmann at fedoraproject.org
Wed Jul 4 08:57:14 UTC 2012
commit dd2d535c78942b21e6e9589e373d52cf41e30663
Author: Marek Goldmann <mgoldman at redhat.com>
Date: Tue Jun 5 15:13:02 2012 +0200
Added org.jboss.as.jsr77 module
0063-Enable-jboss-as-jms-client-bom.patch | 32 +++++++
0064-Added-org.jboss.as.jsr77-module.patch | 134 ++++++++++++++++++++++++++++
jboss-as.spec | 8 ++-
3 files changed, 173 insertions(+), 1 deletions(-)
---
diff --git a/0063-Enable-jboss-as-jms-client-bom.patch b/0063-Enable-jboss-as-jms-client-bom.patch
new file mode 100644
index 0000000..bb8fc04
--- /dev/null
+++ b/0063-Enable-jboss-as-jms-client-bom.patch
@@ -0,0 +1,32 @@
+From 0cd4f0195ec7f05e6cab70bf39b3cd59bc3fd2de Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Tue, 5 Jun 2012 14:03:18 +0200
+Subject: [PATCH 63/63] Enable jboss-as-jms-client-bom
+
+---
+ pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index fa79681..91651f3 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -273,6 +273,7 @@
+ <module>build-config</module>
+ <module>cli</module>
+ <module>client/ejb</module>
++ <module>client/jms</module>
+ <module>clustering</module>
+ <module>cmp</module>
+ <module>config-assembly</module>
+@@ -5974,7 +5975,6 @@
+ <module>build</module>
+ <module>build-config</module>
+ <module>arquillian</module>
+- <module>client/jms</module>
+ <module>client/shade</module>
+ <module>configadmin</module>
+ <module>dist</module>
+--
+1.7.10.2
+
diff --git a/0064-Added-org.jboss.as.jsr77-module.patch b/0064-Added-org.jboss.as.jsr77-module.patch
new file mode 100644
index 0000000..077649b
--- /dev/null
+++ b/0064-Added-org.jboss.as.jsr77-module.patch
@@ -0,0 +1,134 @@
+From 61b157242acc9394b49d126e587dd25787738d20 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Tue, 5 Jun 2012 14:44:00 +0200
+Subject: [PATCH 64/64] Added org.jboss.as.jsr77 module
+
+---
+ build/build.xml | 16 ++++++++--------
+ build/pom.xml | 20 ++++++++++----------
+ pom.xml | 2 +-
+ 3 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index dc1502e..edda9d5 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -145,6 +145,10 @@
+ <maven-resource group="javax.inject" artifact="javax.inject"/>
+ </module-def>
+
++ <module-def name="javax.management.j2ee.api">
++ <maven-resource group="org.jboss.spec.javax.management.j2ee" artifact="jboss-j2eemgmt-api_1.1_spec"/>
++ </module-def>
++
+ <module-def name="javax.persistence.api">
+ <maven-resource group="org.hibernate.javax.persistence" artifact="hibernate-jpa-2.0-api"/>
+ </module-def>
+@@ -474,6 +478,10 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jpa-util"/>
+ </module-def>
+
++ <module-def name="org.jboss.as.jsr77">
++ <maven-resource group="org.jboss.as" artifact="jboss-as-jsr77"/>
++ </module-def>
++
+ <module-def name="org.jboss.as.logging">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-logging"/>
+ </module-def>
+@@ -845,10 +853,6 @@
+ <maven-resource group="javax.jws" artifact="jsr181-api"/>
+ </module-def>
+
+- <module-def name="javax.management.j2ee.api">
+- <maven-resource group="org.jboss.spec.javax.management.j2ee" artifact="jboss-j2eemgmt-api_1.1_spec"/>
+- </module-def>
+-
+ <module-def name="javax.xml.jaxp-provider"/>
+
+ <module-def name="javax.xml.registry.api">
+@@ -1019,10 +1023,6 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-configadmin"/>
+ </module-def>
+
+- <module-def name="org.jboss.as.jsr77">
+- <maven-resource group="org.jboss.as" artifact="jboss-as-jsr77"/>
+- </module-def>
+-
+ <!--
+ <module-def name="org.jboss.as.jacorb">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jacorb"/>
+diff --git a/build/pom.xml b/build/pom.xml
+index 1389c25..353685b 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -389,6 +389,11 @@
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
++ <artifactId>jboss-as-jsr77</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ </dependency>
+
+@@ -653,6 +658,11 @@
+ </dependency>
+
+ <dependency>
++ <groupId>org.jboss.spec.javax.management.j2ee</groupId>
++ <artifactId>jboss-j2eemgmt-api_1.1_spec</artifactId>
++ </dependency>
++
++ <dependency>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.4_spec</artifactId>
+ </dependency>
+@@ -1280,11 +1290,6 @@
+ <artifactId>jboss-as-jdr</artifactId>
+ </dependency>
+
+- <dependency>
+- <groupId>org.jboss.as</groupId>
+- <artifactId>jboss-as-jsr77</artifactId>
+- </dependency>
+-
+ <!--
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+@@ -1537,11 +1542,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.jboss.spec.javax.management.j2ee</groupId>
+- <artifactId>jboss-j2eemgmt-api_1.1_spec</artifactId>
+- </dependency>
+-
+- <dependency>
+ <groupId>org.jboss.spec.javax.xml.registry</groupId>
+ <artifactId>jboss-jaxr-api_1.0_spec</artifactId>
+ </dependency>
+diff --git a/pom.xml b/pom.xml
+index 91651f3..fb3cc49 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -293,6 +293,7 @@
+ <module>jaxrs</module>
+ <module>jmx</module>
+ <module>jpa</module>
++ <module>jsr77</module>
+ <module>management-client-content</module>
+ <module>logging</module>
+ <module>mail</module>
+@@ -5982,7 +5983,6 @@
+ <module>jacorb</module>
+ -->
+ <module>jdr</module>
+- <module>jsr77</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 bbc9c8d..a487335 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 modcluster 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 jsr77 logging management-client-content mail modcluster naming network platform-mbean pojo process-controller protocol remoting sar security server threads transactions web weld
# Additional modules enabled, but not listed above because of different structure:
# clustering
@@ -96,6 +96,8 @@ Patch58: 0059-Added-org.jboss.as.jaxr-module.patch
Patch59: 0060-Added-org.jboss.as.messaging-module.patch
Patch60: 0061-Runtime-dependencies.patch
Patch61: 0062-Added-org.jboss.as.modcluster-module.patch
+Patch62: 0063-Enable-jboss-as-jms-client-bom.patch
+Patch63: 0064-Added-org.jboss.as.jsr77-module.patch
BuildArch: noarch
@@ -144,6 +146,7 @@ BuildRequires: jboss-iiop-client
BuildRequires: jboss-invocation
BuildRequires: jboss-interceptor
BuildRequires: jboss-interceptors-1.1-api
+BuildRequires: jboss-j2eemgmt-1.1-api
BuildRequires: jboss-jacc-1.4-api
BuildRequires: jboss-jad-1.2-api
BuildRequires: jboss-jaxb-2.2-api
@@ -250,6 +253,7 @@ Requires: jboss-iiop-client
Requires: jboss-interceptor
Requires: jboss-interceptors-1.1-api
Requires: jboss-invocation
+Requires: jboss-j2eemgmt-1.1-api
Requires: jboss-jacc-1.4-api
Requires: jboss-jad-1.2-api
Requires: jboss-jaxb-2.2-api
@@ -568,6 +572,7 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath jboss-interceptor-spi) org/jboss/interceptor/spi/main/jboss-interceptor-spi.jar
ln -s $(build-classpath jboss-interceptors-1.1-api) javax/interceptor/api/main/jboss-interceptors-1.1-api.jar
ln -s $(build-classpath jboss-invocation) org/jboss/invocation/main/jboss-invocation.jar
+ ln -s $(build-classpath jboss-jboss-j2eemgmt-1.1-api) javax/management/j2ee/api/main/jboss-j2eemgmt-1.1-api.jar
ln -s $(build-classpath jboss-jacc-1.4-api) javax/security/jacc/api/main/jboss-jacc-1.4-api.jar
ln -s $(build-classpath jboss-jad-1.2-api) javax/enterprise/deploy/api/main/jboss-jad-1.2-api.jar
ln -s $(build-classpath jboss-jaxb-2.2-api) javax/xml/bind/api/main/jboss-jaxb-2.2-api.jar
@@ -740,6 +745,7 @@ rm -rf %{homedir}/modules/org/hornetq/main/lib/linux-${arch}/*
- Create a startup script when creating a new user instance (jboss-as-cp), RHBZ#827588
- The user instance create script (jboss-as-cp) should allow a port offset to be specified, RHBZ#827589
- Added org.jboss.as.modcluster module
+- Added org.jboss.as.jsr77 module
* 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