[Jboss-svn-commits] JBL Code SVN: r1377 - in trunk/labs/kosmos: . build web-portlet/pages

[<jbo...@li...>]

Author: aron.gombas
Date: 2005-10-12 10:07:31 -0400 (Wed, 12 Oct 2005)
New Revision: 1377

Added:
   trunk/labs/kosmos/build-distro.xml
Modified:
   trunk/labs/kosmos/build-portlet.xml
   trunk/labs/kosmos/build-server.xml
   trunk/labs/kosmos/build/build.xml
   trunk/labs/kosmos/build/deploy.xml
   trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
   trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp
Log:
Distribution scheme and build sys changed

Modified: trunk/labs/kosmos/build/build.xml
===================================================================
--- trunk/labs/kosmos/build/build.xml	2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/build/build.xml	2005-10-12 14:07:31 UTC (rev 1377)
@@ -12,7 +12,6 @@
 	
   <!-- read basic properties -->
   <property environment="env"/>
-  <property file="build/build.properties"/>
   <property file="build/kosmos-project.properties"/>
   <property file="build/${module.name}-module.properties"/>
   <property name="module.name.short" value="${project.name.short}-${module.name}"/>
@@ -24,22 +23,13 @@
   <property name="src.dir" location="src"/>
   <property name="web.dir" location="web-${module.name}"/>
   <property name="xdocs.dir" location="xdocs"/>
-  <property name="reference.dir" location="${xdocs.dir}/reference"/>
 	
   <property name="war.name" value="${module.name.short}.war"/>
   <property name="container.dir" location="${env.JBOSS_HOME}/server/default/deploy/${war.name}"/>
-
-  <property name="dist.root.dir" location="dist-${module.name}"/>
 	
-  <property name="dist-bin.root.dir" location="dist-bin-${module.name}"/>
-  <property name="dist-bin.dir" location="${dist-bin.root.dir}/${module.name.full}"/>
+  <property name="dist-bin.dir" location="dist-bin-${module.name}"/>
   <property name="dist-bin.bin.dir" location="${dist-bin.dir}/${war.name}-expanded"/>
   <property name="dist-bin.classes.dir" location="${dist-bin.bin.dir}/WEB-INF/classes"/>
-  <property name="dist-bin.docs.reference.dir" location="${dist-bin.dir}/docs/reference"/>
-	
-  <property name="dist-src.root.dir" location="dist-src-${module.name}"/>
-  <property name="dist-src.dir" location="${dist-src.root.dir}/${module.name.full}"/>
-  <property name="dist-src.docs.api.dir" location="${dist-src.dir}/docs/api"/>
 
   <!-- targets -->
   <target name="init">
@@ -108,63 +98,8 @@
   </target>
    
   <target name="redeploy" depends="undeploy,deploy" description="Redeploys the module to the container"/>
-
-  <target name="javadocs" depends="init" description="Generates the javadocs">
-  	<javadoc destdir="${dist-src.docs.api.dir}" author="true" version="true" use="true" windowtitle="${project.name} API">
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="java/hu/midori/kosmos/**"/>
-      </fileset>
-  	</javadoc>
-  </target>
 	
-  <target name="manual-html" depends="init" description="Creates the manual in HTML format">
-    <mkdir dir="${dist-bin.docs.reference.dir}/html"/>     
-    <java jar="${saxon.dir}/saxon8.jar" fork="true" output="${dist-bin.docs.reference.dir}/html/reference-manual.html">
-      <arg line="-novw"/><!-- supress versin warning -->
-      <arg line="${reference.dir}/reference-manual.xml"/>
-      <arg line="${docbook.dir}/html/docbook.xsl"/>
-    </java>
-    <copy todir="${dist-bin.docs.reference.dir}/html">
-      <fileset dir="${reference.dir}" excludes="**/*.xml"/>
-    </copy>
-  </target>
-  
-  <target name="manual-pdf" depends="init" description="Creates the manual in PDF format">
-    <mkdir dir="${dist-bin.docs.reference.dir}/pdf"/>     
-    <java classname="org.apache.fop.apps.Fop" fork="true">
-      <classpath>
-        <fileset dir="${fop.dir}" includes="**/*.jar"/>
-      </classpath>
-      <arg line="-xml ${reference.dir}/reference-manual.xml"/>
-      <arg line="-xsl ${docbook.dir}/fo/docbook.xsl"/>
-      <arg value="${dist-bin.docs.reference.dir}/pdf/reference-manual.pdf"/>
-    </java>        
-  </target>
-
-  <target name="dist-src" depends="init,clean,javadocs" description="Prepares all source distributables">
-    <mkdir dir="${dist-src.dir}"/>
-    <!-- copy other resources -->
-    <copy todir="${dist-src.dir}"> 
-      <fileset dir="." includes="build-${module.name}.xml,deploy-${module.name}-*.xml"/>
-    </copy>
-    <copy todir="${dist-src.dir}/build">
-      <fileset dir="${build.dir}"/>      	
-    </copy>
-    <copy todir="${dist-src.dir}/conf-${module.name}">
-      <fileset dir="${conf.dir}"/>
-    </copy>
-    <copy todir="${dist-src.dir}/src">
-      <fileset dir="${src.dir}"/>
-    </copy>
-    <copy todir="${dist-src.dir}/web-${module.name}">
-      <fileset dir="${web.dir}"/>
-    </copy>
-    <copy todir="${dist-src.dir}/xdocs">
-      <fileset dir="${xdocs.dir}"/>
-    </copy>
-  </target>
-	
-  <target name="dist-bin" depends="init,all,manual-html,manual-pdf" description="Prepares all binary distributables">
+  <target name="dist-bin" depends="init,all" description="Prepares all binary distributables">
     <!-- pack to WAR -->
     <war destfile="${dist-bin.dir}/${war.name}" basedir="${dist-bin.bin.dir}" webxml="web-${module.name}/WEB-INF/web.xml"/>
     <delete dir="${dist-bin.bin.dir}"/>
@@ -173,23 +108,10 @@
       <fileset dir="." includes="deploy-${module.name}-*.xml"/>
     </copy>
     <copy todir="${dist-bin.dir}/build">
-      <fileset dir="${build.dir}" excludes="build.xml"/>
+      <fileset dir="${build.dir}" includes="deploy.xml,kosmos-project.properties,${module.name}-*-deploy.properties"/>
     </copy>
     <copy todir="${dist-bin.dir}/conf">
       <fileset dir="${conf.dir}"/>
     </copy>
-    <copy todir="${dist-bin.dir}">
-      <fileset dir="${xdocs.dir}/others" includes="**/*"/>
-  	 </copy>
-  </target>
-	
-  <target name="dist" depends="dist-src,dist-bin" description="Packs all distributables">
-    <mkdir dir="${dist.root.dir}"/>
-    <!-- pack -->
-    <zip file="${dist.root.dir}/${module.name.full}-src.zip" basedir="${dist-src.root.dir}"/>
-    <tar destfile="${dist.root.dir}/${module.name.full}-src.tar.gz" basedir="${dist-src.root.dir}" compression="gzip" longfile="gnu"/>
-    <!-- pack -->
-    <zip file="${dist.root.dir}/${module.name.full}.zip" basedir="${dist-bin.root.dir}"/>
-    <tar destfile="${dist.root.dir}/${module.name.full}.tar.gz" basedir="${dist-bin.root.dir}" compression="gzip" longfile="gnu"/>
-  </target>
+  </target>	
 </project>

Modified: trunk/labs/kosmos/build/deploy.xml
===================================================================
--- trunk/labs/kosmos/build/deploy.xml	2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/build/deploy.xml	2005-10-12 14:07:31 UTC (rev 1377)
@@ -29,7 +29,7 @@
   </target>
 
   <target name="deploy" depends="init" description="Deploys the portlet to the container">
-  	<echo message="Deploying to ${container.name} at ${container.dir}"/>
+    <echo message="Deploying to ${container.name} at ${container.dir}"/>
     <mkdir dir="${container.dir}"/>
     <!-- expand WAR -->
     <unzip src="${war.name}" dest="${container.dir}"/>

Added: trunk/labs/kosmos/build-distro.xml
===================================================================
--- trunk/labs/kosmos/build-distro.xml	2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/build-distro.xml	2005-10-12 14:07:31 UTC (rev 1377)
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Kosmos.
+
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+-->
+<!-- Kosmos build-script for the distribution packages -->
+<!-- $Id$ -->
+<project basedir="." default="dist" name="Kosmos Distro">
+  <description>Kosmos Distro build-file</description>
+
+  <!-- read basic properties -->
+  <property file="build/build.properties"/>
+  <property file="build/kosmos-project.properties"/>
+  <property name="distro-bin.name" value="${project.name.short}-${project.version}"/>
+  <property name="distro-src.name" value="${project.name.short}-src-${project.version}"/>
+	
+  <!-- generated paths -->
+  <property name="src.dir" location="src"/>
+  <property name="dist.dir" location="dist"/>
+	
+  <property name="dist-bin.dir" location="${dist.dir}/${distro-bin.name}"/>
+  <property name="dist-bin.docs.reference.dir" location="${dist-bin.dir}/docs/reference"/>
+  <property name="dist-bin.etc.dir" location="${dist-bin.dir}/etc"/>
+  <property name="dist-bin.portlet.dir" location="${dist-bin.dir}/portlet"/>
+  <property name="dist-bin.server.dir" location="${dist-bin.dir}/server"/>
+	
+  <property name="dist-src.dir" location="${dist.dir}/${distro-src.name}"/>
+  <property name="dist-src.docs.api.dir" location="${dist-src.dir}/docs/api"/>
+	
+  <property name="xdocs.dir" location="xdocs"/>
+  <property name="reference.dir" location="${xdocs.dir}/reference"/>
+	
+<!-- TODO create preconfigured package for Gridsphere and JBP?! -->
+<!-- TODO install with the deploy scripts? -->
+
+  <!-- targets -->
+  <target name="init">
+	<echo message="============================================================"/>
+	<echo message="${project.name} distribution - ${project.version}"/>
+	<echo message="Copyright 2005 (C) Midori"/>
+	<echo message="============================================================"/>
+  </target>
+
+  <target name="clean" depends="init" description="Cleans up temporary files created during previous builds">
+    <delete dir="${dist.dir}"/>
+  </target>
+
+  <target name="dist" depends="init,dist-bin,dist-src" description="Prepares all distributables"/>
+	
+  <target name="dist-bin" depends="init,clean" description="Prepares all binary distributables"><!-- ,manual-html,manual-pdf -->
+  	<!-- prepare subprojects -->
+    <ant antfile="build-portlet.xml" target="dist-bin" inheritall="false"/>
+    <ant antfile="build-server.xml" target="dist-bin" inheritall="false"/>
+
+    <!-- collect all files -->
+    <mkdir dir="${dist-bin.etc.dir}"/>
+    <mkdir dir="${dist-bin.portlet.dir}"/>
+    <mkdir dir="${dist-bin.server.dir}"/>
+    <copy todir="${dist-bin.etc.dir}">
+      <fileset dir="etc" includes="**/*"/>
+    </copy>
+    <copy todir="${dist-bin.portlet.dir}">
+      <fileset dir="dist-bin-portlet" includes="**/*"/>
+    </copy>
+    <copy todir="${dist-bin.server.dir}">
+      <fileset dir="dist-bin-server" includes="**/*"/>
+    </copy>
+    <copy todir="${dist-bin.dir}">
+      <fileset dir="xdocs/others" includes="**/*"/>
+    </copy>
+
+    <!-- pack -->
+    <zip file="${dist.dir}/${distro-bin.name}.zip" basedir="${dist.dir}" includes="${distro-bin.name}/**"/>
+    <tar destfile="${dist.dir}/${distro-bin.name}.tar.gz" basedir="${dist.dir}" includes="${distro-bin.name}/**" compression="gzip" longfile="gnu"/>
+  </target>
+	
+  <target name="dist-src" depends="init,clean,javadocs" description="Prepares all source distributables">
+    <!-- collect all files -->
+    <mkdir dir="${dist-src.dir}"/>
+    <copy todir="${dist-src.dir}"> 
+      <fileset dir="." includes="build-*.xml,deploy-*.xml"/>
+      <fileset dir="." includes="build/**"/>
+      <fileset dir="." includes="conf-*/**"/>
+      <fileset dir="." includes="etc/**"/>
+      <fileset dir="." includes="src/**"/>
+      <fileset dir="." includes="web-*/**"/>    	
+      <fileset dir="." includes="xdocs/**"/>    	
+    </copy>
+
+    <!-- pack -->
+    <zip file="${dist.dir}/${distro-src.name}.zip" basedir="${dist.dir}" includes="${distro-src.name}/**"/>
+    <tar destfile="${dist.dir}/${distro-src.name}.tar.gz" basedir="${dist.dir}" includes="${distro-src.name}/**" compression="gzip" longfile="gnu"/>
+  </target>
+
+  <target name="javadocs" depends="init" description="Generates the javadocs">
+    <javadoc destdir="${dist-src.docs.api.dir}" author="true" version="true" use="true" windowtitle="${project.name} API">
+      <fileset dir="${src.dir}" defaultexcludes="yes">
+        <include name="java/hu/midori/kosmos/**"/>
+      </fileset>
+    </javadoc>
+  </target>
+	
+  <target name="manual-html" description="Creates the manual in HTML format">
+    <mkdir dir="${dist-bin.docs.reference.dir}/html"/>     
+    <java jar="${saxon.dir}/saxon8.jar" fork="true" output="${dist-bin.docs.reference.dir}/html/reference-manual.html">
+      <arg line="-novw"/><!-- supress version warning -->
+      <arg line="${reference.dir}/reference-manual.xml"/>
+      <arg line="${docbook.dir}/html/docbook.xsl"/>
+    </java>
+    <copy todir="${dist-bin.docs.reference.dir}/html">
+      <fileset dir="${reference.dir}" excludes="**/*.xml"/>
+    </copy>
+  </target>
+  
+  <target name="manual-pdf" description="Creates the manual in PDF format">
+    <mkdir dir="${dist-bin.docs.reference.dir}/pdf"/>     
+    <java classname="org.apache.fop.apps.Fop" fork="true">
+      <classpath>
+        <fileset dir="${fop.dir}" includes="**/*.jar"/>
+      </classpath>
+      <arg line="-xml ${reference.dir}/reference-manual.xml"/>
+      <arg line="-xsl ${docbook.dir}/fo/docbook.xsl"/>
+      <arg value="${dist-bin.docs.reference.dir}/pdf/reference-manual.pdf"/>
+    </java>        
+  </target>
+</project>

Modified: trunk/labs/kosmos/build-portlet.xml
===================================================================
--- trunk/labs/kosmos/build-portlet.xml	2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/build-portlet.xml	2005-10-12 14:07:31 UTC (rev 1377)
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Kosmos.
+
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+-->
 <!-- Kosmos build-script for the Portlet Module -->
 <!-- $Id$ -->
 <project basedir="." default="redeploy" name="Kosmos Portlet">

Modified: trunk/labs/kosmos/build-server.xml
===================================================================
--- trunk/labs/kosmos/build-server.xml	2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/build-server.xml	2005-10-12 14:07:31 UTC (rev 1377)
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Kosmos.
+
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+-->
 <!-- Kosmos build-script for the Server Module -->
 <!-- $Id$ -->
 <project basedir="." default="redeploy" name="Kosmos Server">

Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp	2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp	2005-10-12 14:07:31 UTC (rev 1377)
@@ -44,7 +44,7 @@
           </td>
           <td>
             &nbsp;
-            <table style="border: 1px solid black;" width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0">
+            <table style="border: 1px solid #DDDDDD;" width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0">
               <tr>
                 <td style="background-color:#00FF00"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${100*projectsIt.successRate}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
                 <td style="background-color:#FF0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.failures) / projectsIt.tests}" maxFractionDigits="0"/>" height="10px" border="0"/></td>

Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp	2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp	2005-10-12 14:07:31 UTC (rev 1377)
@@ -51,7 +51,7 @@
       <table valign="center">
         <tr>
           <td>
-            <table style="border: 1px solid black;" width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0">
+            <table style="border: 1px solid #DDDDDD;" width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0">
               <tr>
                 <td style="background-color:#FF0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.openIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
                 <td style="background-color:#FFFF00"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.codingInProgressIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>