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

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

Author: smcgowan at redhat.com
Date: 2010-01-20 13:44:15 -0500 (Wed, 20 Jan 2010)
New Revision: 99667

Modified:
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/component-matrix/pom.xml
Log:
JBAS-7320 - integrate admin-console

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-01-20 17:49:27 UTC (rev 99666)
+++ trunk/build/build.xml	2010-01-20 18:44:15 UTC (rev 99667)
@@ -359,6 +359,7 @@
         <exclude name="conf/jndi.properties"/>
         <!-- ORBInitialContextFactory -->
         <include name="deploy/**"/>
+        <exclude name="deploy/admin-console.war/**"/>
         <exclude name="deploy/http-invoker.sar/**"/>
         <exclude name="deploy/jmx-remoting.sar/**"/>
         <exclude name="deploy/management/**"/>
@@ -2311,6 +2312,15 @@
       <fileset file="${org.jboss.weld.integration:weld-jboss-int-deployer-assembly:zip}"/>
     </unzip>
 
+    <!-- Install Admin Console -->
+    <mkdir dir="${install.server}/all/deploy/admin-console.war"/>
+    <unjar src="${org.jboss.jopr:jopr-embedded-jbas5:war}"
+          dest="${install.server}/all/deploy/admin-console.war"/>
+ 
+     <mkdir dir="${install.server}/default/deploy/admin-console.war"/>
+     <unjar src="${org.jboss.jopr:jopr-embedded-jbas5:war}"
+          dest="${install.server}/default/deploy/admin-console.war"/>
+
     <!-- Copy varia stuff -->
 
     <!-- Include the juddi sar unpacked -->

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2010-01-20 17:49:27 UTC (rev 99666)
+++ trunk/build/pom.xml	2010-01-20 18:44:15 UTC (rev 99667)
@@ -494,6 +494,11 @@
       <optional>true</optional>
     </dependency>
     <dependency>
+      <groupId>org.jboss.jopr</groupId>
+      <artifactId>jopr-embedded-jbas5</artifactId>
+      <type>war</type>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-jdk</artifactId>
       <optional>true</optional>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-01-20 17:49:27 UTC (rev 99666)
+++ trunk/component-matrix/pom.xml	2010-01-20 18:44:15 UTC (rev 99667)
@@ -104,6 +104,7 @@
     <version.org.jboss.jpa.deployers>1.0.1</version.org.jboss.jpa.deployers>
     <version.org.jboss.jpa.impl>2.0.0</version.org.jboss.jpa.impl>
     <version.org.jboss.jpa.spi>1.0.0</version.org.jboss.jpa.spi>
+    <version.org.jboss.jopr>1.4.0-20100120.135921-68</version.org.jboss.jopr>
     <version.org.jboss.kernel>2.2.0.Alpha2</version.org.jboss.kernel>
     <version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
     <version.org.jboss.logmanager>1.1.1.GA</version.org.jboss.logmanager>
@@ -1402,8 +1403,15 @@
         <artifactId>jboss-integration</artifactId>
         <version>${version.org.jboss.integration}</version>
       </dependency>
-      
+
       <dependency>
+        <groupId>org.jboss.jopr</groupId>
+          <artifactId>jopr-embedded-jbas5</artifactId>
+          <version>${version.org.jboss.jopr}</version>
+          <type>war</type>
+      </dependency>
+
+      <dependency>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-metadata-common</artifactId>
         <version>${version.org.jboss.metadata.common}</version>