[jboss-cvs] JBossAS SVN: r108784 - in branches/switchboard-integration: component-matrix and 1 other directories.

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

Author: jaikiran
Date: 2010-10-22 03:27:40 -0400 (Fri, 22 Oct 2010)
New Revision: 108784

Modified:
   branches/switchboard-integration/build/build.xml
   branches/switchboard-integration/component-matrix/pom.xml
   branches/switchboard-integration/depchain/pom.xml
Log:
JBAS-8548 First round of SwitchBoard integration

Modified: branches/switchboard-integration/build/build.xml
===================================================================
--- branches/switchboard-integration/build/build.xml	2010-10-22 07:26:36 UTC (rev 108783)
+++ branches/switchboard-integration/build/build.xml	2010-10-22 07:27:40 UTC (rev 108784)
@@ -199,7 +199,8 @@
                    module-resteasy,
                    module-hibernate-int,
                    module-hornetq-int,
-                   module-console">
+                   module-console,
+                   module-switchboard">
   </target>
   
   <target name="install" depends="partition-build, jboss-all-client"
@@ -929,7 +930,22 @@
       </fileset>
     </copy>
   </target>
+  
+  <!-- ========= -->
+  <!-- Switchboard -->
+  <!-- ========= -->
+  <target name="module-switchboard" depends="module-server">
 
+    <!-- Copy the switchboard dir in  deployers -->
+    <mkdir dir="${install.all.deployers}/switchboard"/>
+    
+	<unjar src="${org.jboss.switchboard:jboss-switchboard-mc-impl:jar}" dest="${install.all.deployers}/switchboard">
+		<patternset>
+			<include name="META-INF/*.xml"/>
+		</patternset>
+	</unjar>
+  </target>
+	
   <!-- ========= -->
   <!-- Connector -->
   <!-- ========= -->
@@ -2084,6 +2100,15 @@
     	<fileset refid="org.jboss.shrinkwrap:shrinkwrap-impl-base:jar" />
     	<fileset refid="org.jboss.shrinkwrap:shrinkwrap-spi:jar" />
     	<fileset refid="org.jboss.shrinkwrap:shrinkwrap-extension-vfs3:jar" />
+
+      <!-- SwitchBoard -->
+      <fileset refid="org.jboss.switchboard:jboss-switchboard-spi:jar"/>
+      <fileset refid="org.jboss.switchboard:jboss-switchboard-impl:jar"/>
+      <fileset refid="org.jboss.switchboard:jboss-switchboard-mc-spi:jar"/>
+      <fileset refid="org.jboss.switchboard:jboss-switchboard-mc-impl:jar"/>
+      <fileset refid="org.jboss.switchboard:jboss-switchboard-javaee:jar"/>
+      <fileset refid="org.jboss.switchboard:jboss-switchboard-jbmeta-javaee:jar"/>
+    	
       <fileset refid="org.hibernate:hibernate-core:jar"/>
       <fileset refid="org.hibernate:hibernate-commons-annotations:jar"/>
       <fileset refid="org.hibernate:hibernate-entitymanager:jar"/>

Modified: branches/switchboard-integration/component-matrix/pom.xml
===================================================================
--- branches/switchboard-integration/component-matrix/pom.xml	2010-10-22 07:26:36 UTC (rev 108783)
+++ branches/switchboard-integration/component-matrix/pom.xml	2010-10-22 07:27:40 UTC (rev 108784)
@@ -132,6 +132,7 @@
     <version.org.jboss.shrinkwrap>1.0.0-alpha-11</version.org.jboss.shrinkwrap>
     <version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
     <version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
+    <version.org.jboss.switchboard.depchain>1.0.0-alpha-2</version.org.jboss.switchboard.depchain>
     <version.org.jboss.threads>2.0.0.CR4</version.org.jboss.threads>
     <version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
     <version.org.jboss.weld>1.1.0.Beta1</version.org.jboss.weld>
@@ -1316,6 +1317,24 @@
           </exclusion>
         </exclusions>
       </dependency>
+      
+      <dependency>
+        <groupId>org.jboss.switchboard.depchain</groupId>
+        <artifactId>jboss-switchboard-depchain-as6</artifactId>
+        <version>${version.org.jboss.switchboard.depchain}</version>
+        <type>pom</type>
+        <scope>import</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-spi</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-log4j</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
 
         <dependency>
           <groupId>org.jboss.jbossts</groupId>

Modified: branches/switchboard-integration/depchain/pom.xml
===================================================================
--- branches/switchboard-integration/depchain/pom.xml	2010-10-22 07:26:36 UTC (rev 108783)
+++ branches/switchboard-integration/depchain/pom.xml	2010-10-22 07:27:40 UTC (rev 108784)
@@ -1021,6 +1021,23 @@
       <artifactId>jboss-stdio</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.switchboard.depchain</groupId>
+      <artifactId>jboss-switchboard-depchain-as6</artifactId>
+      <type>pom</type>
+      <version>${version.org.jboss.switchboard.depchain}</version>
+      <exclusions>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-spi</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-log4j</artifactId>
+          </exclusion>
+      </exclusions>
+      
+    </dependency>
+    <dependency>
       <groupId>org.jboss.threads</groupId>
       <artifactId>jboss-threads</artifactId>
     </dependency>