[jboss-svn-commits] JBoss Portal SVN: r5675 - branches/JBoss_Portal_Branch_2_4/build

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

Author: julien at jboss.com
Date: 2006-11-19 17:59:36 -0500 (Sun, 19 Nov 2006)
New Revision: 5675

Modified:
   branches/JBoss_Portal_Branch_2_4/build/distrib.xml
Log:
fixed f*cked *p with SVN

Modified: branches/JBoss_Portal_Branch_2_4/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/build/distrib.xml	2006-11-19 22:43:30 UTC (rev 5674)
+++ branches/JBoss_Portal_Branch_2_4/build/distrib.xml	2006-11-19 22:59:36 UTC (rev 5675)
@@ -1,7 +1,7 @@
 <project default="main" name="JBoss Portal">
 
    <property name="source.dir" value="../../jboss-portal-2.4"/>
-   <property name="release.version" value="2.4.1-CR2"/>
+   <property name="release.version" value="2.4.1-CR1"/>
 
    <!-- -->
    <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
@@ -14,45 +14,6 @@
    <property name="portal.build.normal.bundled" value="output/${portal.release.normal.name}-bundled"/>
    <property name="portal.build.ha.bundled" value="output/${portal.release.ha.name}-bundled"/>
 
-<<<<<<< .mine
-<!--
-   <property name="forums.release.name" value="jboss-forums-${release.version}"/>
-   <property name="forums.build.bin" value="output/${forums.release.name}"/>
-   <property name="forums.build.src" value="output/${forums.release.name}-src"/>
--->
-<!-- Licenses -->
-<target name="licenses">
-    <fileset id="thirdparty-licenses" dir="../thirdparty/licenses">
-        <include name="antlr.txt"/>
-        <include name="apache-2.0.txt"/>
-        <include name="bsd.txt"/>
-        <include name="cddl.txt"/>
-        <include name="cpl-1.0/txt"/>
-        <include name="day-jcr.txt"/>
-        <include name="dom4j.txt"/>
-        <include name="ehcache.txt"/>
-        <include name="gpl.txt"/>
-        <include name="hsqldb.txt"/>
-        <include name="httpunit.txt"/>
-        <include name="ironsmith.txt"/>
-        <include name="lgpl.txt"/>
-        <include name="nekohtml.txt"/>
-        <include name="oswego.txt"/>
-        <include name="public-domain.txt"/>
-        <include name="slf4j.txt"/>
-        <include name="sun-jaf.txt"/>
-        <include name="sun-javamail.txt"/>
-        <include name="xdoclet.txt"/>
-    </fileset>    
-    <mkdir dir="output/docs/licenses"/>
-        <concat destfile="output/docs/licenses/thirdparty-licenses.txt">      
-            <fileset refid="thirdparty-licenses"/>
-        </concat>
-        <copy todir="output/docs/licenses">
-            <fileset refid="thirdparty-licenses"/>
-            <fileset dir="licences" includes="JBossEULA.txt"/>
-        </copy>
-=======
    <!--
       <property name="forums.release.name" value="jboss-forums-${release.version}"/>
       <property name="forums.build.bin" value="output/${forums.release.name}"/>
@@ -90,7 +51,6 @@
          <fileset refid="thirdparty-licenses"/>
          <fileset dir="licences" includes="JBossEULA.txt"/>
       </copy>
->>>>>>> .r5673
    </target>