svn commit: r422089 - in /incubator/cayenne/main/trunk/cayenne-site: build-site.xml build-subproject.xml build.xml xdocs/templates/project.xml xdocs/templates/site.vsl

[aa...@apache.org]

Author: aadamchik
Date: Fri Jul 14 16:09:17 2006
New Revision: 422089

URL: http://svn.apache.org/viewvc?rev=422089&view=rev
Log:
cleaning site build script
removing license link from the menu - most Apache projects do not have it, 
as, well, it is an apache license by definition.

Removed:
    incubator/cayenne/main/trunk/cayenne-site/build-site.xml
    incubator/cayenne/main/trunk/cayenne-site/build-subproject.xml
Modified:
    incubator/cayenne/main/trunk/cayenne-site/build.xml
    incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/project.xml
    incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/site.vsl

Modified: incubator/cayenne/main/trunk/cayenne-site/build.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-site/build.xml?rev=422089&r1=422088&r2=422089&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-site/build.xml (original)
+++ incubator/cayenne/main/trunk/cayenne-site/build.xml Fri Jul 14 16:09:17 2006
@@ -58,17 +58,47 @@
     </target>
 
 	<!-- ============================================= -->
-    <!-- Deploys only pages located in cayenne-site project -->
+    <!-- Deploys the site  -->
     <!-- ============================================= -->
-    <target name="site" depends="prepare">
-		<ant antfile="build-site.xml" target="site"/>
-		<antcall target="rsync-prompt"/>
+    <target name="site" depends="prepare,doc,resources,assemble,rsync-prompt"/>
+
+    <!-- ========================================== -->
+    <!-- Builds Site documenatation. -->
+    <!-- ========================================== -->
+    <target name="doc">
+        <anakia basedir="xdocs/xml" destdir="${build}/cayenne-site/out"
+             extension=".html" style="site.vsl"
+             projectFile="../templates/project.xml"
+             includes="**/*.xml"
+             lastModifiedCheck="true"
+             templatePath="xdocs/templates">
+        </anakia>
+    </target>
+	
+    <target name="assemble">
+		<copy todir="${dist}">
+			<fileset dir="${build}/cayenne-site/out"  includes="**/*.html"/>
+			
+			<filterset begintoken="&lt;!--@" endtoken="@--&gt;">
+				<filter token="LICENSE" value="${license.text}"/>
+			</filterset>
+		</copy>
+    </target>
+    
+    <!-- ========================================== -->
+    <!-- Copies documentation resources, such as images -->
+    <!-- and styles. -->
+    <!-- ========================================== -->
+    <target name="resources">
+        <copy todir="${dist}">
+            <fileset dir="static"/>
+        </copy>
     </target>
      
     <target name="rsync-prompt">
     	<echo>==== To synchronize with the site, run something like this:
-		# cd ${dist.base}/${project.name}-${project.version}/
-		# rsync -az -e ssh cayenne www.objectstyle.org:/var/sites/objectstyle/html/</echo>
+    		
+cd ${dist.base}/${project.name}-${project.version}/ &amp;&amp; rsync -az -e ssh cayenne www.objectstyle.org:/var/sites/objectstyle/html/</echo>
     </target>
     
     <!-- ========================================== -->

Modified: incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/project.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/project.xml?rev=422089&r1=422088&r2=422089&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/project.xml (original)
+++ incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/project.xml Fri Jul 14 16:09:17 2006
@@ -8,7 +8,6 @@
         <item name="Contributors" href="/contributors.html"/>
         <item name="How Can I Help" href="/how-can-i-help.html"/>
         <item name="Success Stories" href="/poweredby.html"/>
-        <item name="License" href="/license.html"/>
         <item name="Commercial Support" href="/cayenne-commercial-support.html"/>
     </menu>
 
@@ -28,8 +27,4 @@
         <item name="Code Repository" href="http://objectstyle.org/confluence/display/CAY/Subversion+Access"/>
         <item name="Developer Guide"  href="http://objectstyle.org/confluence/display/CAY/Developer+Guide"/>
     </menu>
-    
-	<!-- Embedded TOC Start -->
-    <!-...@-->
-    <!-- Embedded TOC End -->
 </project>

Modified: incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/site.vsl
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/site.vsl?rev=422089&r1=422088&r2=422089&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/site.vsl (original)
+++ incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/site.vsl Fri Jul 14 16:09:17 2006
@@ -77,7 +77,7 @@
     <td width="1" bgcolor="#333333"><img src="${relativePath}/images/spacer.gif" width="1" height="1"></td>
     <td width="${centralWidth}" valign="top"><table width="100%" border="0" cellspacing="10" cellpadding="0" class="body-black">
       <tbody><tr>
-        <td>Copyright &copy;2001-2006 ObjectStyle Group</td>
+        <td>Copyright &copy;2001-2006 Apache Software Foundation</td>
       </tr>
     </tbody></table></td>
     <td width="1" bgcolor="#333333"><img src="${relativePath}/images/spacer.gif" width="1" height="1"></td>