[jboss-cvs] JBossAS SVN: r103708 - in trunk: osgi/zip/src/assembly and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2010-04-08 12:29:17 -0400 (Thu, 08 Apr 2010)
New Revision: 103708

Modified:
   trunk/build/build.xml
   trunk/osgi/zip/src/assembly/assembly.xml
Log:
[JBAS-7884] Disable the TM bean that registers the JTA services.
[JBAS-7661] Add OSGi to the 'all' profile


Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-04-08 16:07:05 UTC (rev 103707)
+++ trunk/build/build.xml	2010-04-08 16:29:17 UTC (rev 103708)
@@ -231,14 +231,16 @@
         <exclude name="tmp/**"/>
         <exclude name="work/**"/>
         <exclude name="conf/jacorb.properties"/>
+        <exclude name="deployers/clustering-deployer-jboss-beans.xml"/>
+        <exclude name="deployers/osgi.deployer/**"/>
         <exclude name="deploy/cluster/**"/>
-        <exclude name="deploy/iiop-service.xml"/>
         <exclude name="deploy/deploy.last/**"/>
         <exclude name="deploy/httpha-invoker.sar/**"/>
-        <exclude name="deploy/snmp-adaptor.sar/**"/>
+        <exclude name="deploy/iiop-service.xml"/>
         <exclude name="deploy/juddi-service.sar/**"/>
         <exclude name="deploy/messaging/**"/>
-        <exclude name="deployers/clustering-deployer-jboss-beans.xml"/>
+        <exclude name="deploy/osgi/**"/>
+        <exclude name="deploy/snmp-adaptor.sar/**"/>
       </fileset>
     </copy>
     <!-- leave the empty default/lib directory there -->
@@ -363,21 +365,21 @@
     <!-- 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}">
+      <fileset dir="${install.all.deployers}">
+        <include name="jbossweb.deployer/**"/>
+        <include name="jboss-threads.deployer/**"/>
+        <include name="jboss-logging.deployer/**"/>
+        <include name="osgi.deployer/**"/>
         <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>
@@ -387,15 +389,16 @@
       </fileset>
     </copy>
     <copy todir="${install.osgi.deploy}">
-      <fileset dir="${install.default.deploy}">
+      <fileset dir="${install.all.deploy}">
+        <include name="jbossweb.sar/**"/>
+        <include name="osgi/**"/>
+        <include name="ROOT.war/**"/>
+        <include name="security/**"/>
       	<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"/>
@@ -1755,7 +1758,7 @@
     <property name="osgi.module.name" value="osgi"/>
     <property name="osgi.module.output" value="${project.root}/${osgi.module.name}/zip/target"/>
     
-    <unzip dest="${install.osgi}" src="${osgi.module.output}/jboss-as-osgi-distribution-${pom.project.version}.zip"/>
+    <unzip dest="${install.all}" src="${osgi.module.output}/jboss-as-osgi-distribution-${pom.project.version}.zip"/>
   </target>
 
   <!-- =========== -->
@@ -1805,9 +1808,9 @@
     </copy>
   </target>
 
-   <!-- ============ -->
-  <!-- HornetQ    -->
   <!-- ============ -->
+  <!-- HornetQ      -->
+  <!-- ============ -->
 
   <target name="module-hornetq-int">
     <property name="hornetq.module.name" value="hornetq-int"/>

Modified: trunk/osgi/zip/src/assembly/assembly.xml
===================================================================
--- trunk/osgi/zip/src/assembly/assembly.xml	2010-04-08 16:07:05 UTC (rev 103707)
+++ trunk/osgi/zip/src/assembly/assembly.xml	2010-04-08 16:29:17 UTC (rev 103708)
@@ -14,6 +14,7 @@
       </includes>
       <outputDirectory>deployers/osgi.deployer/META-INF</outputDirectory>
     </fileSet>
+    <!-- [JBAS-7884] TransactionManager not found after OSGi integration
     <fileSet>
       <directory>src/resources</directory>
       <includes>
@@ -21,6 +22,7 @@
       </includes>
       <outputDirectory>deploy/osgi</outputDirectory>
     </fileSet>
+    -->
   </fileSets>
   <dependencySets>
     <dependencySet>