[jboss-cvs] JBossAS SVN: r96120 - in branches/Branch_5_x: component-matrix and 1 other directory.

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

Author: smcgowan at redhat.com
Date: 2009-11-06 15:19:24 -0500 (Fri, 06 Nov 2009)
New Revision: 96120

Modified:
   branches/Branch_5_x/build/build-distr.xml
   branches/Branch_5_x/component-matrix/pom.xml
Log:
JBAS-7320 - admin-console update for Beta

Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml	2009-11-06 19:06:01 UTC (rev 96119)
+++ branches/Branch_5_x/build/build-distr.xml	2009-11-06 20:19:24 UTC (rev 96120)
@@ -2337,41 +2337,8 @@
     <!-- Install Admin Console -->
     <mkdir dir="${install.server}/all/deploy/admin-console.war"/>
     <unjar src="${org.jboss.jopr.lib}/jopr-embedded-jbas5.war" dest="${install.server}/all/deploy/admin-console.war"/>
-    <copy todir="${install.server}/all/deploy/admin-console.war/WEB-INF/lib" filtering="no">
-        <fileset dir="${apache.myfaces.lib}">
-           <include name="**/myfaces-api*.jar"/>
-           <include name="**/myfaces-impl*.jar"/>
-        </fileset>
-        <fileset dir="${apache.codec.lib}">
-           <include name="**/commons-codec*.jar"/>
-           <exclude name="**/*source*"/>
-        </fileset>
-        <fileset dir="${apache.discovery.lib}">
-           <include name="**/commons-discovery*.jar"/>
-        </fileset>
-    </copy>
-    <copy todir="${install.server}/all/deploy/admin-console.war/WEB-INF" 
-          file="${project.root}/varia/src/resources/admin-console/WEB-INF/web.xml"
-          overwrite="true"/>
-    
 
     <mkdir dir="${install.server}/default/deploy/admin-console.war"/>
     <unjar src="${org.jboss.jopr.lib}/jopr-embedded-jbas5.war" dest="${install.server}/default/deploy/admin-console.war"/>
-    <copy todir="${install.server}/default/deploy/admin-console.war/WEB-INF/lib" filtering="no">
-        <fileset dir="${apache.myfaces.lib}">
-           <include name="**/myfaces-api*.jar"/>
-           <include name="**/myfaces-impl*.jar"/>
-        </fileset>
-        <fileset dir="${apache.codec.lib}">
-           <include name="**/commons-codec*.jar"/>
-           <exclude name="**/*source*"/>
-        </fileset>
-        <fileset dir="${apache.discovery.lib}">
-           <include name="**/commons-discovery*.jar"/>
-        </fileset>
-    </copy>
-    <copy todir="${install.server}/default/deploy/admin-console.war/WEB-INF" 
-          file="${project.root}/varia/src/resources/admin-console/WEB-INF/web.xml"
-          overwrite="true"/>
   </target>
 </project>

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-11-06 19:06:01 UTC (rev 96119)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-11-06 20:19:24 UTC (rev 96120)
@@ -92,7 +92,7 @@
     <version.org.jboss.ejb3.endpoint.deployer>0.1.4</version.org.jboss.ejb3.endpoint.deployer>
     <version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.1.GA</version.org.jboss.jbossxb>
-    <version.org.jboss.jopr>1.3.2-SNAPSHOT</version.org.jboss.jopr>    
+    <version.org.jboss.jopr>1.3.2.GA_MyFaces</version.org.jboss.jopr>    
     <version.org.jboss.jpa.deployers>1.0.1-20091014.133942-1</version.org.jboss.jpa.deployers>
     <version.org.jboss.jpa.impl>2.0.0-20091106.154459-5</version.org.jboss.jpa.impl>
     <version.org.jboss.jpa.spi>1.0.0-20091014.133355-1</version.org.jboss.jpa.spi>