[jboss-as] - Added org.jboss.as.arquillian module - Added org.jboss.as.osgi module - Added org.jboss.as.configa
Marek Goldmann
goldmann at fedoraproject.org
Wed Jul 4 08:57:19 UTC 2012
commit f4311827ae25d61c4971bbb57d4ae1977806070f
Author: Marek Goldmann <mgoldman at redhat.com>
Date: Fri Jun 15 14:45:38 2012 +0200
- Added org.jboss.as.arquillian module
- Added org.jboss.as.osgi module
- Added org.jboss.as.configadmin module
0065-Added-org.jboss.as.arquillian-module.patch | 32 ++++
0066-Added-org.jboss.as.osgi-module.patch | 206 +++++++++++++++++++++
0067-Disable-for-now-ARQ-testng-integration.patch | 26 +++
0068-Added-org.jboss.as.configadmin-module.patch | 88 +++++++++
jboss-as.spec | 29 +++-
5 files changed, 379 insertions(+), 2 deletions(-)
---
diff --git a/0065-Added-org.jboss.as.arquillian-module.patch b/0065-Added-org.jboss.as.arquillian-module.patch
new file mode 100644
index 0000000..765d224
--- /dev/null
+++ b/0065-Added-org.jboss.as.arquillian-module.patch
@@ -0,0 +1,32 @@
+From 4e1da188b6258b9c4cb59d2da9d245c167ac91f9 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Wed, 6 Jun 2012 14:50:26 +0200
+Subject: [PATCH 65/65] Added org.jboss.as.arquillian module
+
+---
+ pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index fb3cc49..6a223d3 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -269,6 +269,7 @@
+ </properties>
+
+ <modules>
++ <module>arquillian</module>
+ <module>build</module>
+ <module>build-config</module>
+ <module>cli</module>
+@@ -5975,7 +5976,6 @@
+ <module>appclient</module>
+ <module>build</module>
+ <module>build-config</module>
+- <module>arquillian</module>
+ <module>client/shade</module>
+ <module>configadmin</module>
+ <module>dist</module>
+--
+1.7.10.2
+
diff --git a/0066-Added-org.jboss.as.osgi-module.patch b/0066-Added-org.jboss.as.osgi-module.patch
new file mode 100644
index 0000000..f798b21
--- /dev/null
+++ b/0066-Added-org.jboss.as.osgi-module.patch
@@ -0,0 +1,206 @@
+From a125c823c9d448e20c3df22561e91f461cb90d40 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Mon, 11 Jun 2012 15:20:06 +0200
+Subject: [PATCH 66/66] Added org.jboss.as.osgi module
+
+---
+ build/build.xml | 58 +++++++++++++++++++++++++-------------------------
+ build/pom.xml | 20 ++++++++---------
+ osgi/service/pom.xml | 4 ----
+ pom.xml | 4 ++--
+ 4 files changed, 41 insertions(+), 45 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index edda9d5..61a3716 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -510,6 +510,10 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-network"/>
+ </module-def>
+
++ <module-def name="org.jboss.as.osgi">
++ <maven-resource group="org.jboss.as" artifact="jboss-as-osgi-service"/>
++ </module-def>
++
+ <module-def name="org.jboss.as.platform-mbean">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-platform-mbean"/>
+ </module-def>
+@@ -643,6 +647,27 @@
+ <maven-resource group="org.jboss.msc" artifact="jboss-msc"/>
+ </module-def>
+
++ <module-def name="org.jboss.osgi.framework">
++ <maven-resource group="org.jboss.osgi.deployment" artifact="jbosgi-deployment"/>
++ <maven-resource group="org.jboss.osgi.framework" artifact="jbosgi-framework-core"/>
++ <maven-resource group="org.jboss.osgi.resolver" artifact="jbosgi-resolver-api"/>
++ <maven-resource group="org.jboss.osgi.resolver" artifact="jbosgi-resolver-spi"/>
++ <maven-resource group="org.jboss.osgi.resolver" artifact="jbosgi-resolver-felix"/>
++ </module-def>
++
++ <module-def name="org.jboss.osgi.metadata">
++ <maven-resource group="org.jboss.osgi.metadata" artifact="jbosgi-metadata"/>
++ </module-def>
++
++ <module-def name="org.jboss.osgi.spi">
++ <maven-resource group="org.jboss.osgi.spi" artifact="jbosgi-spi"/>
++ </module-def>
++
++ <module-def name="org.jboss.osgi.vfs">
++ <maven-resource group="org.jboss.osgi.vfs" artifact="jbosgi-vfs"/>
++ <maven-resource group="org.jboss.osgi.vfs" artifact="jbosgi-vfs30"/>
++ </module-def>
++
+ <module-def name="org.jboss.logging">
+ <maven-resource group="org.jboss.logging" artifact="jboss-logging"/>
+ </module-def>
+@@ -778,6 +803,10 @@
+
+ <module-def name="org.omg.api" />
+
++ <module-def name="org.osgi.core">
++ <maven-resource group="org.osgi" artifact="org.osgi.core"/>
++ </module-def>
++
+ <module-def name="org.picketbox">
+ <maven-resource group="org.picketbox" artifact="picketbox"/>
+ <maven-resource group="org.picketbox" artifact="picketbox-infinispan"/>
+@@ -1046,10 +1075,6 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jpa-openjpa"/>
+ </module-def>
+
+- <module-def name="org.jboss.as.osgi">
+- <maven-resource group="org.jboss.as" artifact="jboss-as-osgi-service"/>
+- </module-def>
+-
+ <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="jboss711"/>
+@@ -1067,32 +1092,11 @@
+ <maven-resource group="jboss.jaxbintros" artifact="jboss-jaxb-intros"/>
+ </module-def>
+
+- <module-def name="org.jboss.osgi.framework">
+- <maven-resource group="org.jboss.osgi.deployment" artifact="jbosgi-deployment"/>
+- <maven-resource group="org.jboss.osgi.framework" artifact="jbosgi-framework-core"/>
+- <maven-resource group="org.jboss.osgi.resolver" artifact="jbosgi-resolver-api"/>
+- <maven-resource group="org.jboss.osgi.resolver" artifact="jbosgi-resolver-spi"/>
+- <maven-resource group="org.jboss.osgi.resolver" artifact="jbosgi-resolver-felix"/>
+- </module-def>
+-
+ <module-def name="org.jboss.osgi.repository">
+ <maven-resource group="org.jboss.osgi.repository" artifact="jbosgi-repository-api"/>
+ <maven-resource group="org.jboss.osgi.repository" artifact="jbosgi-repository-core"/>
+ </module-def>
+
+- <module-def name="org.jboss.osgi.metadata">
+- <maven-resource group="org.jboss.osgi.metadata" artifact="jbosgi-metadata"/>
+- </module-def>
+-
+- <module-def name="org.jboss.osgi.spi">
+- <maven-resource group="org.jboss.osgi.spi" artifact="jbosgi-spi"/>
+- </module-def>
+-
+- <module-def name="org.jboss.osgi.vfs">
+- <maven-resource group="org.jboss.osgi.vfs" artifact="jbosgi-vfs"/>
+- <maven-resource group="org.jboss.osgi.vfs" artifact="jbosgi-vfs30"/>
+- </module-def>
+-
+ <module-def name="org.jboss.security.xacml">
+ <maven-resource group="org.jboss.security" artifact="jbossxacml"/>
+ </module-def>
+@@ -1176,10 +1180,6 @@
+ <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>
+-
+ <module-def name="org.picketlink">
+ <maven-resource group="org.picketlink" artifact="picketlink-fed" jandex="true"/>
+ <maven-resource group="org.picketlink" artifact="picketlink-bindings" jandex="true"/>
+diff --git a/build/pom.xml b/build/pom.xml
+index 353685b..3ca8540 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -429,6 +429,16 @@
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
++ <artifactId>jboss-as-osgi-configadmin</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.as</groupId>
++ <artifactId>jboss-as-osgi-service</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-pojo</artifactId>
+ </dependency>
+
+@@ -1299,16 +1309,6 @@
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+- <artifactId>jboss-as-osgi-configadmin</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.as</groupId>
+- <artifactId>jboss-as-osgi-service</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-platform-mbean</artifactId>
+ </dependency>
+
+diff --git a/osgi/service/pom.xml b/osgi/service/pom.xml
+index f20f5be..338da61 100644
+--- a/osgi/service/pom.xml
++++ b/osgi/service/pom.xml
+@@ -90,10 +90,6 @@
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+- <dependency>
+- <groupId>org.osgi</groupId>
+- <artifactId>org.osgi.enterprise</artifactId>
+- </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+diff --git a/pom.xml b/pom.xml
+index 6a223d3..e0ed21d 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -302,6 +302,7 @@
+ <module>modcluster</module>
+ <module>naming</module>
+ <module>network</module>
++ <module>osgi</module>
+ <module>platform-mbean</module>
+ <module>pojo</module>
+ <module>process-controller</module>
+@@ -419,7 +420,7 @@
+ <exclude>jacorb:jacorb</exclude>
+ <exclude>javassist:javassist</exclude>
+ <!-- <exclude>javax.persistence:persistence-api</exclude> Needs investigation -->
+- <exclude>javax.servlet:servlet-api</exclude>
++ <!-- <exclude>javax.servlet:servlet-api</exclude> Pulled in by org.osgi:org.osgi.compendium, alias -->
+ <exclude>javax.transaction:jta</exclude>
+ <exclude>javax.xml:jaxrpc-api</exclude>
+ <exclude>javax.xml.soap:saaj-api</exclude>
+@@ -5983,7 +5984,6 @@
+ <module>jacorb</module>
+ -->
+ <module>jdr</module>
+- <module>osgi</module>
+ <module>remoting-test</module>
+ <module>spec-api</module>
+ <module>webservices</module>
+--
+1.7.10.2
+
diff --git a/0067-Disable-for-now-ARQ-testng-integration.patch b/0067-Disable-for-now-ARQ-testng-integration.patch
new file mode 100644
index 0000000..1e63cbf
--- /dev/null
+++ b/0067-Disable-for-now-ARQ-testng-integration.patch
@@ -0,0 +1,26 @@
+From 83edff3ce4092a23b9951de588c198ad1f66fffc Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Fri, 15 Jun 2012 09:56:36 +0200
+Subject: [PATCH 67/67] Disable for now ARQ testng-integration
+
+---
+ arquillian/pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arquillian/pom.xml b/arquillian/pom.xml
+index 346a9cc..22eef3b 100644
+--- a/arquillian/pom.xml
++++ b/arquillian/pom.xml
+@@ -42,8 +42,8 @@
+ <module>container-remote</module>
+ <module>protocol-jmx</module>
+ <module>testenricher-msc</module>
+- <module>testng-integration</module>
+ <!--
++ <module>testng-integration</module>
+ <module>container-embedded</module>
+ <module>protocol-servlet</module>
+ <module>processor-jsfunit</module>
+--
+1.7.10.2
+
diff --git a/0068-Added-org.jboss.as.configadmin-module.patch b/0068-Added-org.jboss.as.configadmin-module.patch
new file mode 100644
index 0000000..beabad8
--- /dev/null
+++ b/0068-Added-org.jboss.as.configadmin-module.patch
@@ -0,0 +1,88 @@
+From 8bd973662e0fa34ae9aaf8026348ee7c76f18bb6 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <mgoldman at redhat.com>
+Date: Mon, 23 Apr 2012 13:06:45 +0200
+Subject: [PATCH 68/68] Added org.jboss.as.configadmin module
+
+---
+ build/build.xml | 8 ++++----
+ build/pom.xml | 10 +++++-----
+ pom.xml | 2 +-
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 61a3716..92b0e28 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -400,6 +400,10 @@
+ <maven-resource group="org.jboss.as" artifact="jboss-as-cmp"/>
+ </module-def>
+
++ <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.connector">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-connector"/>
+ </module-def>
+@@ -1048,10 +1052,6 @@
+ <maven-resource-with-classifier group="org.jboss.as" artifact="jboss-as-console" classifier="resources"/>
+ </module-def>
+
+- <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.jacorb">
+ <maven-resource group="org.jboss.as" artifact="jboss-as-jacorb"/>
+diff --git a/build/pom.xml b/build/pom.xml
+index 3ca8540..ef6e1ff 100644
+--- a/build/pom.xml
++++ b/build/pom.xml
+@@ -294,6 +294,11 @@
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
++ <artifactId>jboss-as-configadmin</artifactId>
++ </dependency>
++
++ <dependency>
++ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ </dependency>
+
+@@ -1286,11 +1291,6 @@
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+- <artifactId>jboss-as-configadmin</artifactId>
+- </dependency>
+-
+- <dependency>
+- <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-console</artifactId>
+ <classifier>resources</classifier>
+ </dependency>
+diff --git a/pom.xml b/pom.xml
+index e0ed21d..04eae77 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -278,6 +278,7 @@
+ <module>clustering</module>
+ <module>cmp</module>
+ <module>config-assembly</module>
++ <module>configadmin</module>
+ <module>connector</module>
+ <module>controller</module>
+ <module>controller-client</module>
+@@ -5978,7 +5979,6 @@
+ <module>build</module>
+ <module>build-config</module>
+ <module>client/shade</module>
+- <module>configadmin</module>
+ <module>dist</module>
+ <!--
+ <module>jacorb</module>
+--
+1.7.10.2
+
diff --git a/jboss-as.spec b/jboss-as.spec
index a487335..905b217 100644
--- a/jboss-as.spec
+++ b/jboss-as.spec
@@ -15,7 +15,7 @@
%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
+# arquillian domain-http clustering jpa osgi
Name: jboss-as
Version: 7.1.1
@@ -98,6 +98,10 @@ Patch60: 0061-Runtime-dependencies.patch
Patch61: 0062-Added-org.jboss.as.modcluster-module.patch
Patch62: 0063-Enable-jboss-as-jms-client-bom.patch
Patch63: 0064-Added-org.jboss.as.jsr77-module.patch
+Patch64: 0065-Added-org.jboss.as.arquillian-module.patch
+Patch65: 0066-Added-org.jboss.as.osgi-module.patch
+Patch66: 0067-Disable-for-now-ARQ-testng-integration.patch
+Patch67: 0068-Added-org.jboss.as.configadmin-module.patch
BuildArch: noarch
@@ -110,6 +114,8 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-james-project
BuildRequires: apache-juddi
BuildRequires: apache-scout
+BuildRequires: arquillian-core
+BuildRequires: arquillian-osgi
BuildRequires: atinject
BuildRequires: bean-validation-api
BuildRequires: bsf
@@ -118,6 +124,7 @@ BuildRequires: cdi-api
BuildRequires: dom4j
# TODO: ecj dependency tree is big and ugly...
BuildRequires: ecj
+BuildRequires: felix-configadmin
BuildRequires: guava
BuildRequires: h2
BuildRequires: hibernate-jpa-2.0-api
@@ -132,6 +139,7 @@ BuildRequires: javacc-maven-plugin
BuildRequires: javamail
BuildRequires: javassist
BuildRequires: jgroups
+BuildRequires: jbosgi-repository
BuildRequires: jboss-annotations-1.1-api
BuildRequires: jboss-classfilewriter
BuildRequires: jboss-common-core
@@ -203,6 +211,8 @@ BuildRequires: picketbox
BuildRequires: picketbox-commons
BuildRequires: resteasy >= 2.3.2-7
BuildRequires: rhq-plugin-annotations
+BuildRequires: shrinkwrap
+BuildRequires: shrinkwrap-resolver
BuildRequires: slf4j
BuildRequires: slf4j-jboss-logmanager
BuildRequires: staxmapper
@@ -222,12 +232,15 @@ Requires: apache-commons-logging
Requires: apache-juddi
Requires: apache-scout
Requires: apr
+Requires: arquillian-core
+Requires: arquillian-osgi
Requires: bean-validation-api
Requires: cal10n
Requires: cdi-api
Requires: dom4j
# TODO: ecj dependency tree is big and ugly...
Requires: ecj
+Requires: felix-configadmin
Requires: guava
Requires: h2
Requires: hibernate-jpa-2.0-api
@@ -239,6 +252,7 @@ Requires: jandex
Requires: java >= 1:1.7.0
Requires: javamail
Requires: javassist
+Requires: jbosgi-repository
Requires: jboss-annotations-1.1-api
Requires: jboss-classfilewriter
Requires: jboss-common-core
@@ -304,6 +318,8 @@ Requires: picketbox
Requires: picketbox-commons
Requires: resteasy >= 2.3.2-7
Requires: rhq-plugin-annotations
+Requires: shrinkwrap
+Requires: shrinkwrap-resolver
Requires: slf4j
Requires: slf4j-jboss-logmanager
Requires: staxmapper
@@ -377,13 +393,19 @@ for m in %{modules} build-config ee-deployment; do
done
# Definition of submodules
-multimodules="domain-http clustering jpa"
+multimodules="arquillian domain-http clustering jpa osgi"
# If a submodule contains hyphen in the name, just skip it, e.g. domain-http => domainhttp
+modules_arquillian="common container-managed container-remote protocol-jmx testenricher-msc"
modules_clustering="api common impl jgroups infinispan registry service web-spi web-infinispan ejb3-infinispan"
modules_jpa="util spi"
modules_domainhttp="interface error-context"
+modules_osgi="service configadmin"
for m in ${multimodules}; do
+ # POM
+ cp -a ${m}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}-parent.pom
+ # DEPMAP
+ %add_maven_depmap JPP.%{name}-%{name}-${m}-parent.pom
eval submodules=\$"modules_${m//-/}"
@@ -746,6 +768,9 @@ rm -rf %{homedir}/modules/org/hornetq/main/lib/linux-${arch}/*
- The user instance create script (jboss-as-cp) should allow a port offset to be specified, RHBZ#827589
- Added org.jboss.as.modcluster module
- Added org.jboss.as.jsr77 module
+- Added org.jboss.as.arquillian module
+- Added org.jboss.as.osgi module
+- Added org.jboss.as.configadmin module
* 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