[jboss-cvs] JBossAS SVN: r103474 - in trunk: component-matrix and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2010-04-02 06:10:15 -0400 (Fri, 02 Apr 2010)
New Revision: 103474

Modified:
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
Log:
[JBAS-7661] Create separate 'osgi' profile

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-04-02 10:04:24 UTC (rev 103473)
+++ trunk/build/build.xml	2010-04-02 10:10:15 UTC (rev 103474)
@@ -137,6 +137,12 @@
     <property name="install.jbossweb.deployers" value="${install.jbossweb}/deployers"/>
     <property name="install.jbossweb.conf" value="${install.jbossweb}/conf"/>
 
+    <property name="install.osgi" value="${install.server}/osgi"/>
+    <property name="install.osgi.lib" value="${install.osgi}/lib"/>
+    <property name="install.osgi.deploy" value="${install.osgi}/deploy"/>
+    <property name="install.osgi.deployers" value="${install.osgi}/deployers"/>
+    <property name="install.osgi.conf" value="${install.osgi}/conf"/>
+
     <property name="install.standard" value="${install.server}/standard"/>
     <property name="install.standard.lib" value="${install.standard}/lib"/>
     <property name="install.standard.deploy" value="${install.standard}/deploy"/>
@@ -354,6 +360,72 @@
       </fileset>
     </copy>
 
+    <!-- Build server/osgi manually -->
+    <mkdir dir="${install.osgi}"/>
+    <mkdir dir="${install.osgi.lib}"/>
+    <!-- empty -->
+    <copy todir="${install.osgi.conf}">
+      <fileset dir="${install.default.conf}">
+        <include name="**"/>
+      </fileset>
+    </copy>
+    <copy todir="${install.osgi.deployers}">
+      <fileset dir="${install.default.deployers}">
+        <include name="alias-deployers-jboss-beans.xml"/>
+        <include name="core-naming-jboss-beans.xml"/>
+        <include name="jbossweb.deployer/**"/>
+        <include name="metadata-deployer-jboss-beans.xml"/>
+        <include name="security-deployer-jboss-beans.xml"/>
+        <include name="jboss-threads.deployer/**"/>
+        <include name="jboss-logging.deployer/**"/>
+        <exclude name="jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml"/>
+      </fileset>
+    </copy>
+    <copy todir="${install.osgi.deployers}/jbossweb.deployer/META-INF">
+      <fileset dir="${tomcat.module.output}/resources/standalone">
+        <include name="war-deployers-jboss-beans.xml"/>
+      </fileset>
+    </copy>
+    <copy todir="${install.osgi.deploy}">
+      <fileset dir="${install.default.deploy}">
+      	<include name="jboss-logging.xml"/>
+        <include name="jbossweb.sar/**"/>
+        <include name="jmx-console-activator-jboss-beans.xml"/>
+        <include name="jmx-jboss-beans.xml"/>
+        <include name="naming-jboss-beans.xml"/>
+        <include name="remoting-jboss-beans.xml"/>
+        <include name="ROOT.war/**"/>
+        <include name="security/**"/>
+        <include name="thread-pool-jboss-beans.xml"/>
+        <include name="transaction-jboss-beans.xml"/>
+        <include name="transaction-service.xml"/>
+        <include name="legacy-conf-service.xml"/>
+        <exclude name="jbossweb.sar/jstl.jar"/>
+        <exclude name="jbossweb.sar/jsf-libs/**"/>
+        <exclude name="jbossweb.sar/META-INF/jboss-structure.xml"/>
+        <exclude name="jbossweb.sar/META-INF/jboss-beans.xml"/>
+        <exclude name="jbossweb.sar/server.xml"/>
+        <exclude name="jbossweb.sar/web.xml"/>
+      </fileset>
+      <fileset dir="${project.root}/profileservice/target/resources/">
+        <include name="hdscanner-jboss-beans.xml"/>
+      </fileset>
+    </copy>
+    <copy todir="${install.osgi.deploy}/jbossweb.sar/META-INF">
+      <fileset dir="${tomcat.module.output}/resources">
+        <include name="jboss-structure.xml"/>
+      </fileset>
+      <fileset dir="${tomcat.module.output}/resources/standalone">
+        <include name="jboss-beans.xml"/>
+      </fileset>
+    </copy>
+    <copy todir="${install.osgi.deploy}/jbossweb.sar">
+      <fileset dir="${tomcat.module.output}/resources/standalone">
+        <include name="server.xml"/>
+        <include name="web.xml"/>
+      </fileset>
+    </copy>
+
     <!-- Build standard config manually -->
     <copy todir="${install.standard}">
       <fileset dir="${install.default}">
@@ -1308,9 +1380,9 @@
     </copy>
   </target>
 
-  <!-- ===== -->
+  <!-- ========= -->
   <!-- JBoss Web -->
-  <!-- ===== -->
+  <!-- ========= -->
 
   <target name="module-tomcat">
     <property name="tomcat.module.name" value="tomcat"/>
@@ -1668,7 +1740,7 @@
     <property name="osgi.module.name" value="osgi"/>
     <property name="osgi.module.output" value="${project.root}/${osgi.module.name}/zip/target"/>
     
-    <unzip dest="${install.all}" src="${osgi.module.output}/jboss-as-osgi-distribution-${pom.project.version}.zip"/>
+    <unzip dest="${install.osgi}" src="${osgi.module.output}/jboss-as-osgi-distribution-${pom.project.version}.zip"/>
   </target>
 
   <!-- =========== -->

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-04-02 10:04:24 UTC (rev 103473)
+++ trunk/component-matrix/pom.xml	2010-04-02 10:10:15 UTC (rev 103474)
@@ -69,7 +69,7 @@
     <version.jboss.osgi.spi>1.0.5.SP1</version.jboss.osgi.spi>
     <version.jboss.osgi.vfs>1.0.0</version.jboss.osgi.vfs>
     <version.jboss.osgi.webapp>0.7.2.SP2</version.jboss.osgi.webapp>
-    <version.jboss.osgi.webconsole>1.0.3-SNAPSHOT</version.jboss.osgi.webconsole>
+    <version.jboss.osgi.webconsole>1.0.3</version.jboss.osgi.webconsole>
     <version.jboss.osgi.xml.binding>2.0.2.Beta4.SP1</version.jboss.osgi.xml.binding>
     <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
     <version.jboss.web>3.0.0-beta-4</version.jboss.web>