Author: rineholt
Date: Fri Mar 10 10:06:58 2006
New Revision: 384879
URL: http://svn.apache.org/viewcvs?rev=384879&view=rev
Log:
fixes links, allows us to open in new windows... work in progress
Added:
incubator/tuscany/site/maven-site.vm
incubator/tuscany/site/src/site/scripts/
incubator/tuscany/site/src/site/scripts/tuscanymain.js
Modified:
incubator/tuscany/site/pom.xml
incubator/tuscany/site/src/site/xdoc/documentation.xml
incubator/tuscany/site/src/site/xdoc/installjava.xml
incubator/tuscany/site/src/site/xdoc/wiki.xml
Added: incubator/tuscany/site/maven-site.vm
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/site/maven-site.vm?rev=384879&view=auto
==============================================================================
--- incubator/tuscany/site/maven-site.vm (added)
+++ incubator/tuscany/site/maven-site.vm Fri Mar 10 10:06:58 2006
@@ -0,0 +1,184 @@
+#macro ( banner $id )
+ #if ( $siteDescriptor.getChild( $id ) )
+ #set ( $e = $siteDescriptor.getChild( $id ) )
+ #if( $e.getChild( "href" ) )
+ #set ( $link = $e.getChild( "href" ).getValue() )
+ <a href="$link" id="$id">
+ #else
+ <span id="$id">
+ #end
+
+ #if( $e.getChild( "src" ) )
+ #set ( $src = $e.getChild( "src" ).getValue() )
+ #if ( ! ( $src.toLowerCase().startsWith("http") ||
$src.toLowerCase().startsWith("https") ) )
+ #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+ #set ( $src = $src.replaceAll( "\\", "/" ) )
+ #end
+ #if ( $e.getChild( "alt" ) )
+ #set ( $alt = $e.getChild( "alt" ).getValue() )
+ #else
+ #set ( $alt = "" )
+ #end
+ <img src="$src" alt="$alt" />
+ #else
+ $e.getChild( "name" ).getValue()
+ #end
+
+ #if( $e.getChild( "href" ) )
+ </a>
+ #else
+ </span>
+ #end
+ #end
+#end
+
+#macro ( links )
+ #set ( $counter = 0 )
+ #set ( $links = $siteDescriptor.getChild( "body" ).getChild( "links" ) )
+ #foreach( $item in $links.getChildren() )
+ #set ( $counter = $counter + 1 )
+ <a href="$item.getAttribute( "href" )">$item.getAttribute( "name" )</a>
+ #if ( $links.getChildCount() > $counter )
+ |
+ #end
+ #end
+#end
+
+#macro ( displayTree $display $item )
+ #if ( $item && $item.getChildren() && $item.getChildCount() > 0 )
+ #foreach( $subitem in $item.getChildren() )
+ #set ( $subitemHref = $PathTool.calculateLink( $subitem.getAttribute(
"href" ), $relativePath ) )
+ #set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) )
+
+ #if ( $currentFileName == $subitemHref )
+ #set ( $display = true )
+ #end
+
+ #displayTree( $display $subitem )
+ #end
+ #end
+#end
+
+#macro ( menuItem $item )
+ #set ( $collapse = "none" )
+ #set ( $currentItemHref = $PathTool.calculateLink( $item.getAttribute(
"href" ), $relativePath ) )
+ #set ( $currentFileName = $currentFileName.replaceAll( "\\", "/" ) )
+ #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+
+ #if ( $item && $item.getChildCount() > 0 )
+ #if ( ( $item.getAttribute( "collapse" ) ) && ( $item.getAttribute(
"collapse" ).equalsIgnoreCase( "false" ) ) )
+ #set ( $collapse = "expanded" )
+ #else
+ ## By default collapsed
+ #set ( $collapse = "collapsed" )
+ #end
+
+ #if ( $currentFileName == $currentItemHref )
+ #set ( $collapse = "expanded" )
+ #end
+ #end
+ <li class="$collapse">
+ #if ( $currentFileName == $currentItemHref )
+ <strong><a href="$currentItemHref">$item.getAttribute( "name"
)</a></strong>
+ #else
+ <a href="$currentItemHref">$item.getAttribute( "name" )</a>
+ #end
+ #if ( $item && $item.getChildren() && $item.getChildCount() > 0 )
+ #set ( $display = false )
+ #set ( $itemTmp = $item )
+ #displayTree( $display $itemTmp )
+
+ #if ( $collapse == "expanded" || $display )
+ <ul>
+ #foreach( $subitem in $item.getChildren() )
+ #menuItem( $subitem )
+ #end
+ </ul>
+ #end
+ #end
+ </li>
+#end
+
+#macro ( mainMenu )
+ #set ( $menus = $siteDescriptor.getChild( "body" ).getChildren( "menu" ) )
+ #foreach( $menu in $menus )
+ <h5>$menu.getAttribute( "name" )</h5>
+ <ul>
+ #foreach( $item in $menu.getChildren() )
+ #menuItem( $item )
+ #end
+ </ul>
+ #end
+#end
+
+#macro ( copyright )
+ #if ( $project )
+ #set ( $currentYear = ${currentDate.year} + 1900 )
+
+ #if ( ${project.inceptionYear} && ( ${project.inceptionYear} !=
${currentYear.toString()} ) )
+ ${project.inceptionYear}-${currentYear}
+ #else
+ ${currentYear}
+ #end
+
+ #if ( ${project.organization} && ${project.organization.name} )
+ ${project.organization.name}
+ #end
+ #end
+#end
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+ <head>
+ <title>$title</title>
+ <style type="text/css" media="all">
+ @import url("$relativePath/css/maven-base.css");
+ @import url("$relativePath/css/maven-theme.css");
+ @import url("$relativePath/css/site.css");
+ </style>
+ <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css"
media="print" />
+ <script src="scripts/tuscanymain.js">
+ </script>
+
+ #foreach( $author in $authors )
+ <meta name="author" content="$author" />
+ #end
+ <meta http-equiv="Content-Type" content="text/html;
charset=${outputEncoding}" />
+ </head>
+ <body class="composite">
+ <div id="banner">
+ #set ( $banner = "bannerLeft" )
+ #banner( $banner )
+ #set ( $banner = "bannerRight" )
+ #banner( $banner )
+ <div class="clear">
+ <hr/>
+ </div>
+ </div>
+ <div id="breadcrumbs">
+ <div class="xleft">$i18n.getString( "site-plugin", $locale,
"template.lastpublished" ): $currentDate</div>
+ <div class="xright">#links()</div>
+ <div class="clear">
+ <hr/>
+ </div>
+ </div>
+ <div id="leftColumn"><div id="navcolumn">#mainMenu()<a
href="http://maven.apache.org/"; title="$i18n.getString( "site-plugin", $locale,
"template.builtby" ) Maven" id="poweredBy">
+ <img alt="$i18n.getString( "site-plugin", $locale,
"template.builtby" ) Maven"
src="$relativePath/images/logos/maven-feather.png"></img>
+ </a>
+ </div></div>
+ <div id="bodyColumn">
+ <div id="contentBox">
+ $bodyContent
+ </div>
+ </div>
+ <div class="clear">
+ <hr/>
+ </div>
+ <div id="footer">
+ <div class="xright">©#copyright()</div>
+ <div class="clear">
+ <hr/>
+ </div>
+ </div>
+ </body>
+</html>
Modified: incubator/tuscany/site/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/site/pom.xml?rev=384879&r1=384878&r2=384879&view=diff
==============================================================================
--- incubator/tuscany/site/pom.xml (original)
+++ incubator/tuscany/site/pom.xml Fri Mar 10 10:06:58 2006
@@ -72,6 +72,38 @@
<target>1.5</target>
</configuration>
</plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>pre-site</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="target/site/samples/java" />
+ <copy todir="target/site/samples/java" >
+ <fileset dir="../java/samples">
+ <patternset>
+ <include name="**/readme.htm" />
+ </patternset>
+ </fileset>
+ </copy>
+ <mkdir dir="target/site/scripts" />
+ <copy todir="target/site/scripts" >
+ <fileset dir="src/site/scripts"/>
+ </copy>
+
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
</plugins>
<resources>
@@ -88,6 +120,14 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <templateDirectory>file:///${basedir}/</templateDirectory>
+ <template>maven-site.vm</template>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
@@ -114,4 +154,10 @@
<url>scp://minotaur.apache.org/www/incubator.apache.org/tuscany/</url>
</site>
</distributionManagement>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/tuscany</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/tuscany</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/incubator/tuscany/</url>
+ </scm>
</project>
Added: incubator/tuscany/site/src/site/scripts/tuscanymain.js
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/site/src/site/scripts/tuscanymain.js?rev=384879&view=auto
==============================================================================
--- incubator/tuscany/site/src/site/scripts/tuscanymain.js (added)
+++ incubator/tuscany/site/src/site/scripts/tuscanymain.js Fri Mar 10 10:06:58
2006
@@ -0,0 +1,5 @@
+
+function linkNewWindow(url,text)
+{
+ document.write('<a href="'+url+'" target=_blank>'+text+'</a>');
+}
Modified: incubator/tuscany/site/src/site/xdoc/documentation.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/site/src/site/xdoc/documentation.xml?rev=384879&r1=384878&r2=384879&view=diff
==============================================================================
--- incubator/tuscany/site/src/site/xdoc/documentation.xml (original)
+++ incubator/tuscany/site/src/site/xdoc/documentation.xml Fri Mar 10 10:06:58
2006
@@ -45,24 +45,14 @@
</tr>
<tr>
<td>
+
+ <script
type="text/javascript">linkNewWindow('samples/java/readme.htm','Tuscany Samples
README file');</script>
<a
href="acceptance/readme.htm">
- Tuscany
Acceptance Test
- </a>
- </td>
- <td>
- Explains how to setup
and run the Acceptance
- Test Suite provided
with Apache Tuscany.
- </td>
- </tr>
- <tr>
- <td>
- <a
href="samples/readme.htm">
- Tuscany Samples
+
</a>
</td>
<td>
- Explains setup and
usage of the samples
- provided by with Apache
Tuscany.
+ Explains how to setup
and run the Java examples.
</td>
</tr>
<tr>
@@ -97,9 +87,7 @@
</tr>
<tr>
<td>
- <a
href="http://download.boulder.ibm.com/ibmdl/pub/software/dw/specs/ws-sca/SCA_White_Paper1_09.pdf";>
- SCA White Paper
- </a>
+ <script
type="text/javascript">linkNewWindow('http://download.boulder.ibm.com/ibmdl/pub/software/dw/specs/ws-sca/SCA_White_Paper1_09.pdf','SCA
White Paper');</script>
</td>
<td>
A white paper
describing Service Component Architecture.
@@ -107,9 +95,7 @@
</tr>
<tr>
<td>
- <a
href="http://download.boulder.ibm.com/ibmdl/pub/software/dw/specs/ws-sdo/Next-Gen-Data-Programming-Whitepaper.pdf";>
- SDO White Paper
- </a>
+ <script
type="text/javascript">linkNewWindow('http://download.boulder.ibm.com/ibmdl/pub/software/dw/specs/ws-sdo/Next-Gen-Data-Programming-Whitepaper.pdf','SDO
White Paper');</script>
</td>
<td>
A white paper that
explains the SDO programming model
@@ -117,9 +103,7 @@
</tr>
<tr>
<td>
- <a
href="http://download.boulder.ibm.com/ibmdl/pub/software/dw/specs/ws-sca/SCA_BuildingYourFirstApplication_V09.pdf";>
- SCA: "Building
your first application"
- </a>
+ <script
type="text/javascript">linkNewWindow('http://download.boulder.ibm.com/ibmdl/pub/software/dw/specs/ws-sca/SCA_BuildingYourFirstApplication_V09.pdf','SCA:
"Building your first application');</script>
</td>
<td>
The simplified
"BigBank" application as a worked example.
@@ -127,9 +111,7 @@
</tr>
<tr>
<td>
- <a
href="RDB_DAS_white_paper_v-0.1.2.pdf">
- DAS White
Paper: The Data Access Service
- </a>
+ <script
type="text/javascript">linkNewWindow('RDB_DAS_white_paper_v-0.1.2.pdf','DAS
White Paper: The Data Access Service');</script>
</td>
<td>
How to access
relational data in terms of Service Data Objects (not yet on the website - to
be provided)
@@ -218,4 +200,4 @@
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: incubator/tuscany/site/src/site/xdoc/installjava.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/site/src/site/xdoc/installjava.xml?rev=384879&r1=384878&r2=384879&view=diff
==============================================================================
--- incubator/tuscany/site/src/site/xdoc/installjava.xml (original)
+++ incubator/tuscany/site/src/site/xdoc/installjava.xml Fri Mar 10 10:06:58
2006
@@ -1,72 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as
applicable.
+ Copyright (c) 2005 the apache software foundation or its licensors, as
applicable.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ licensed under the apache license, version 2.0 (the "license");
+ you may not use this file except in compliance with the license.
+ you may obtain a copy of the license at
+
+ http://www.apache.org/licenses/license-2.0
+
+ unless required by applicable law or agreed to in writing, software
+ distributed under the license is distributed on an "as is" basis,
+ without warranties or conditions of any kind, either express or implied.
+ see the license for the specific language governing permissions and
+ limitations under the license.
-->
<document url="install.xml">
<properties>
- <author email="[EMAIL PROTECTED]">Mike Edwards</author>
+ <author email="[EMAIL PROTECTED]">mike edwards</author>
- <title>Apache Tuscany - Installation Instructions for Java
Projects</title>
+ <title>apache tuscany - installation instructions for java
projects</title>
</properties>
<body>
- <section name="Installation Instructions for Java Projects">
- <p>This page describes what you need to know to install the Java
Projects of Tuscany.
+ <section name="installation instructions for java projects">
+ <p>this page describes what you need to know to install the java
projects of tuscany.
</p>
- <p>If you haven't already, the first step is to download the latest
release of Apache Tuscany from our <a href="download.html">Downloads</a> page.
+ <p>if you haven't already, the first step is to download the latest
release of apache tuscany from our <a href="download.html">downloads</a> page.
</p>
</section>
- <section name="System Requirements">
- <p>In order to run the Tuscany Java Projects there are some
minimum system requirements</p>
+ <section name="system requirements">
+ <p>in order to run the tuscany java projects there are some
minimum system requirements</p>
<table style="text-align: left; width: 100%;" border="1"
cellpadding="2" cellspacing="2">
<tbody>
<tr>
- <td>JDK</td>
+ <td>jdk</td>
<td>
<ul>
<li>
- <a
href="http://java.sun.com/j2se/1.5.0/download.jsp";>
- JDK 5.0
- </a>
+ <script
type="text/javascript">linknewwindow('http://java.sun.com/j2se/1.5.0/download.jsp','jdk
5.0');</script>
</li>
</ul>
</td>
</tr>
<tr>
- <td>Operating System</td>
+ <td>operating system</td>
<td>
<ul>
- <li>Windows XP SP2</li>
- <li>Linux: Red Hat
Fedora Core </li>
+ <li>windows xp sp2</li>
+ <li>linux: red hat
fedora core </li>
</ul>
</td>
</tr>
<tr>
- <td>Other components</td>
+ <td>other components</td>
<td>
<ul>
- <li><a
href="http://tomcat.apache.org/";>
- Apache Tomcat
5.5
- </a></li>
+ <li>
+ <script
type="text/javascript">linknewwindow('http://tomcat.apache.org/','apache tomcat
5.5');</script>
+ </li>
</ul>
</td>
</tr>
@@ -74,9 +72,11 @@
</table>
</section>
- <section name="Configuring Apache Tuscany">
+ <section name="configuring apache tuscany">
<p>Detailed instructions on how to configure your Tomcat
environment, or a Stand-Alone environment,
- can be found in the <a href="samples/readme.htm">Samples README
file</a>.</p>
+ can be found in the
+ <script
type="text/javascript">linkNewWindow('samples/java/readme.htm','Samples README
file');</script>
+ </p>
</section>
</body>
Modified: incubator/tuscany/site/src/site/xdoc/wiki.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/site/src/site/xdoc/wiki.xml?rev=384879&r1=384878&r2=384879&view=diff
==============================================================================
--- incubator/tuscany/site/src/site/xdoc/wiki.xml (original)
+++ incubator/tuscany/site/src/site/xdoc/wiki.xml Fri Mar 10 10:06:58 2006
@@ -28,11 +28,10 @@
<p>
Tuscany has a Wiki which you can find
- <a href="http://wiki.apache.org/ws/Tuscany";>
- here.
- </a>
+ <script
type="text/javascript">linkNewWindow('http://wiki.apache.org/ws/Tuscany','here');</script>
+
</p>
</body>
-</document>
\ No newline at end of file
+</document>
