Author: saminda
Date: Sun Dec 9 23:55:35 2007
New Revision: 10771
Log:
Fixing filtering related problems for documentation/sh/bat and other files
Modified:
trunk/solutions/identity/modules/distribution/pom.xml
trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
trunk/solutions/identity/modules/documentation/pom.xml
trunk/solutions/identity/modules/documentation/src/site/site.xml
trunk/solutions/identity/modules/documentation/src/site/xdoc/idp_administratorguide.xml
trunk/solutions/identity/modules/documentation/src/site/xdoc/idp_production.xml
trunk/solutions/identity/modules/documentation/src/site/xdoc/index.xml
trunk/solutions/identity/modules/documentation/src/site/xdoc/index_docs.xml
trunk/solutions/identity/modules/documentation/src/site/xdoc/installation_guide.xml
trunk/solutions/identity/modules/documentation/src/site/xdoc/release-notes.xml
trunk/solutions/identity/modules/documentation/src/site/xdoc/rp_developer_guide.xml
Modified: trunk/solutions/identity/modules/distribution/pom.xml
==============================================================================
--- trunk/solutions/identity/modules/distribution/pom.xml (original)
+++ trunk/solutions/identity/modules/distribution/pom.xml Sun Dec 9
23:55:35 2007
@@ -73,6 +73,30 @@
<phase>process-classes</phase>
<configuration>
<tasks>
+ <!-- TODO This filtering should be
removed once the filtering bug fixed in Mvn -->
+ <echo message="##############
Initialize filter tokens #################"/>
+ <filter token="wso2is_version"
value="${identity.solution.version}"/>
+ <filter token="wso2wsas_version"
value="${wsas.version}"/>
+ <filter token="bcprov_jdk13_version"
value="${bcprov.jdk13.version}"/>
+ <filter token="bcprov_jdk15_version"
value="${bcprov.jdk15.version}"/>
+
+ <mkdir
dir="${basedir}/target/documentation" />
+ <copy todir="target/documentation"
filtering="on">
+ <fileset
dir="../../target/site/documentation">
+ <include name="**/**.html"/>
+ <include name="**/**.css"/>
+ <include name="**/**.xsl"/>
+ <include name="**/**.js"/>
+ </fileset>
+ </copy>
+ <copy todir="target/documentation">
+ <fileset
dir="../../target/site/documentation">
+ <include name="**/**.png"/>
+ <include name="**/**.gif"/>
+ <include name="**/**.jpg"/>
+ </fileset>
+ </copy>
+
<javadoc packagenames="org.wso2.*"
overview="../../etc/copyright.html"
stylesheetfile="../../etc/JavadocStyles.css"
Modified:
trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
==============================================================================
--- trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
(original)
+++ trunk/solutions/identity/modules/distribution/src/assemble/assembly-bin.xml
Sun Dec 9 23:55:35 2007
@@ -60,7 +60,7 @@
<include>org.wso2.solutions.identity:wso2is-idp-sample:jar</include>
<!-- Other 3rd party jars-->
<include>org.apache.axis2:mex-impl:jar</include>
-
<include>org.wso2.commons.usermanager:user-verification:jar</include>
+
<include>org.wso2.commons.usermanager:user-verification:jar</include>
<include>org.wso2.commons.usermanager:usermanager-core:jar</include>
<include>org.wso2.commons.usermanager:usermanager-config-annotation:jar</include>
<!-- todo to new version-->
@@ -151,34 +151,37 @@
<filtered>true</filtered>
</fileSet>
- <fileSet>
+ <!--<fileSet>
<directory>../../target/site/documentation</directory>
-
<outputDirectory>${identity.solution.home.dir}/lib/tomcat/webapps/documentation
- </outputDirectory>
- <filtered>true</filtered>
+
<outputDirectory>${identity.solution.home.dir}/lib/tomcat/webapps/documentation</outputDirectory>
<includes>
<include>**/**.html</include>
<include>**/**.css</include>
<include>**/**.xsl</include>
<include>**/**.js</include>
</includes>
+ <useStrictFiltering>true</useStrictFiltering>
+ <filtered>true</filtered>
</fileSet>
<fileSet>
<directory>../../target/site/documentation</directory>
-
<outputDirectory>${identity.solution.home.dir}/lib/tomcat/webapps/documentation
- </outputDirectory>
+
<outputDirectory>${identity.solution.home.dir}/lib/tomcat/webapps/documentation</outputDirectory>
<includes>
<include>**/**.png</include>
<include>**/**.gif</include>
<include>**/**.jpg</include>
</includes>
+ </fileSet>-->
+
+ <fileSet>
+ <directory>target/documentation</directory>
+
<outputDirectory>${identity.solution.home.dir}/lib/tomcat/webapps/documentation</outputDirectory>
</fileSet>
<fileSet>
<directory>../documentation/src/site/resources</directory>
-
<outputDirectory>${identity.solution.home.dir}/lib/tomcat/webapps/documentation
- </outputDirectory>
+
<outputDirectory>${identity.solution.home.dir}/lib/tomcat/webapps/documentation</outputDirectory>
<filtered>true</filtered>
<includes>
<include>**/**.css</include>
@@ -225,7 +228,8 @@
<source>../identity-provider/conf/log4j.properties</source>
<outputDirectory>${identity.solution.home.dir}/conf</outputDirectory>
<destName>log4j.properties</destName>
- </file>
+ <filtered>true</filtered>
+ </file>
<file>
@@ -293,16 +297,19 @@
<outputDirectory>${identity.solution.home.dir}/bin</outputDirectory>
<fileMode>755</fileMode>
<destName>wso2is</destName>
+ <filtered>true</filtered>
</file>
<file>
<source>src/bin/debug-wso2is.sh</source>
<outputDirectory>${identity.solution.home.dir}/bin</outputDirectory>
<fileMode>755</fileMode>
<destName>debug</destName>
+ <filtered>true</filtered>
</file>
<file>
<source>src/bin/wso2is.bat</source>
<outputDirectory>${identity.solution.home.dir}/bin</outputDirectory>
+ <filtered>true</filtered>
</file>
</files>
Modified: trunk/solutions/identity/modules/documentation/pom.xml
==============================================================================
--- trunk/solutions/identity/modules/documentation/pom.xml (original)
+++ trunk/solutions/identity/modules/documentation/pom.xml Sun Dec 9
23:55:35 2007
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>documentation</artifactId>
- <name></name>
+ <name />
<description>This is the documentation module of the project.</description>
<packaging>pom</packaging>
Modified: trunk/solutions/identity/modules/documentation/src/site/site.xml
==============================================================================
--- trunk/solutions/identity/modules/documentation/src/site/site.xml
(original)
+++ trunk/solutions/identity/modules/documentation/src/site/site.xml Sun Dec
9 23:55:35 2007
@@ -23,7 +23,7 @@
</menu>
<menu name="Downloads">
<item name="Releases"
-
href="http://dist.wso2.org/products/solutions/identity/${wso2is_version}"/>
+
href="http://dist.wso2.org/products/solutions/identity/@wso2is_version@"/>
</menu>
<menu name="Documentation" href="index_docs.html">
<item name="Adminstrator Guide"
href="idp_administratorguide.html"/>
Modified:
trunk/solutions/identity/modules/documentation/src/site/xdoc/idp_administratorguide.xml
==============================================================================
---
trunk/solutions/identity/modules/documentation/src/site/xdoc/idp_administratorguide.xml
(original)
+++
trunk/solutions/identity/modules/documentation/src/site/xdoc/idp_administratorguide.xml
Sun Dec 9 23:55:35 2007
@@ -19,11 +19,11 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<body>
<p>[<a
-href="http://dist.wso2.org/products/wsas/java/${wso2is_version}";>Download</a>]
+href="http://dist.wso2.org/products/wsas/java/@wso2is_version@";>Download</a>]
| [<a href="index_docs.html">Documentation Index</a>] | [<a
href="release-notes.html">Release Note</a>]</p>
-<h1>WSO2 Identity Solution, v${wso2is_version}-Administrator's Guide</h1>
+<h1>WSO2 Identity Solution, [EMAIL PROTECTED]@-Administrator's Guide</h1>
<p>This document provides information and instructions on the functionality
of the Management Console of WSO2 Identity Solution .</p>
Modified:
trunk/solutions/identity/modules/documentation/src/site/xdoc/idp_production.xml
==============================================================================
---
trunk/solutions/identity/modules/documentation/src/site/xdoc/idp_production.xml
(original)
+++
trunk/solutions/identity/modules/documentation/src/site/xdoc/idp_production.xml
Sun Dec 9 23:55:35 2007
@@ -17,7 +17,7 @@
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml";>
<body>
-<h1>WSO2 Identity Solution, v${wso2is_version} : Deploying Identity Provider
in Production</h1>
+<h1>WSO2 Identity Solution, [EMAIL PROTECTED]@ : Deploying Identity Provider
in Production</h1>
<p>The identity provider by default comes configured with a simple sample and
can be used in the localhost to try all the samples. There are a set of
@@ -29,7 +29,7 @@
<h2>Step 1: Edit server configuration file</h2>
-<p>Open wso2-identity-solution-${wso2is_version}/conf/server.xml file</p>
+<p>Open [EMAIL PROTECTED]@/conf/server.xml file</p>
<p> This private key is used for the HTTPS channel and for the token issuer to
sign the issued tokens. This information has to be changed in two files.
@@ -93,7 +93,7 @@
]]></pre>
-<h2>Step 2 : wso2-identity-solution-${wso2is_version}/conf/axis2.xml file</h2>
+<h2>Step 2 : [EMAIL PROTECTED]@/conf/axis2.xml file</h2>
<p>The "transportReceiver" configurations of axis2.xml will have to be updated
to match the keystore and ports setting changes.</p>
Modified: trunk/solutions/identity/modules/documentation/src/site/xdoc/index.xml
==============================================================================
--- trunk/solutions/identity/modules/documentation/src/site/xdoc/index.xml
(original)
+++ trunk/solutions/identity/modules/documentation/src/site/xdoc/index.xml
Sun Dec 9 23:55:35 2007
@@ -17,12 +17,12 @@
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml";>
<body>
-<h1>Welcome to WSO2 Identity Solution, v${wso2is_version}</h1>
+<h1>Welcome to WSO2 Identity Solution, [EMAIL PROTECTED]@</h1>
-<h2>October 03rd, 2007 - WSO2 Identity Solution , v${wso2is_version}
Released!</h2>
+<h2>October 03rd, 2007 - WSO2 Identity Solution , [EMAIL PROTECTED]@
Released!</h2>
<p>[<a
-href="http://dist.wso2.org/products/solutions/identity/${wso2is_version}";>Download</a>]
+href="http://dist.wso2.org/products/solutions/identity/@wso2is_version@";>Download</a>]
| [<a href="index_docs.html">Documentation Home</a>] | [<a
href="release-notes.html">Release Note</a>]</p>
@@ -82,7 +82,7 @@
<p>See the <a href="index_docs.html">full list of documents</a> with
instructions on installation, administration and running samples with
-WSO2 Identity Solution , v${wso2is_version}.</p>
+WSO2 Identity Solution , [EMAIL PROTECTED]@.</p>
<a></a>
<h3></h3>
Modified:
trunk/solutions/identity/modules/documentation/src/site/xdoc/index_docs.xml
==============================================================================
--- trunk/solutions/identity/modules/documentation/src/site/xdoc/index_docs.xml
(original)
+++ trunk/solutions/identity/modules/documentation/src/site/xdoc/index_docs.xml
Sun Dec 9 23:55:35 2007
@@ -17,7 +17,7 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<body>
<p>[<a
-href="http://dist.wso2.org/products/wsas/java/${wso2is_version}";>Download</a>]
+href="http://dist.wso2.org/products/wsas/java/@wso2is_version@";>Download</a>]
| [<a href="index_docs.html">Documentation Home</a>] | [<a
href="release-notes.html">Release Note</a>]</p>
Modified:
trunk/solutions/identity/modules/documentation/src/site/xdoc/installation_guide.xml
==============================================================================
---
trunk/solutions/identity/modules/documentation/src/site/xdoc/installation_guide.xml
(original)
+++
trunk/solutions/identity/modules/documentation/src/site/xdoc/installation_guide.xml
Sun Dec 9 23:55:35 2007
@@ -17,10 +17,10 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<body>
<p>[<a
-href="http://dist.wso2.org/products/solutions/identity${wso2is_version}";>Download</a>]
+href="http://dist.wso2.org/products/solutions/identity/@wso2is_version@";>Download</a>]
| [<a href="index_docs.xml">Documentation Home</a>] | [<a
href="release-notes.html">Release Note</a>]</p>
-<h1>WSO2 Identity Solution, v${wso2is_version} - Installation Guide</h1>
+<h1>WSO2 Identity Solution, [EMAIL PROTECTED]@ - Installation Guide</h1>
<p>Your feedback on WSO2 Identity Solution is most appreciated. Please send
them to our <a
href="index.xml#mail">mailing lists.</a></p>
@@ -59,31 +59,31 @@
<h2 id="Installing">Installing on Microsoft Windows</h2>
<p><strong>Note</strong>: Out of Microsoft Windows platforms, the WSO2
Identity
-Solution, v${wso2is_version} release has been successfully tested only on
+Solution, [EMAIL PROTECTED]@ release has been successfully tested only on
Windows XP.</p>
The following steps will take you through the installation for the MS Windows
XP
operating system.
<ol>
-<li><a
href="http://dist.wso2.org/products/solutions/identity${wso2is_version}";>
+<li><a
href="http://dist.wso2.org/products/solutions/identity/@wso2is_version@";>
Download</a> the WSO2 Identity solution binary distribution.</li>
<li>Extract the zip archive.</li>
<li>Set the JAVA_HOME environment variable to your Java installation.</li>
<li>Execute the WSO2 Identity Solution : Identity Provider starting script.
-e.g., C:\wso2-identity-solution-${wso2is_version}\bin\wso2is.bat</li>
+e.g., C:[EMAIL PROTECTED]@\bin\wso2is.bat</li>
<li>Check your WSO2 Identity Solution instance using the URL
https://localhost:12443</li>
</ol>
<h2 id="Installing">Installing on Linux</h2>
<ol>
-<li><a
href="http://dist.wso2.org/products/solutions/identity${wso2is_version}";>
+<li><a
href="http://dist.wso2.org/products/solutions/identity/@wso2is_version@";>
Download</a> the WSO2 Identity solution binary distribution.</li>
<li>Extract the zip archive.</li>
<li>Set the JAVA_HOME environment variable to your Java installation.</li>
<li>Execute the WSO2 Identity Solution : Identity Provider starting script.
-e.g., /identity/wso2-identity-solution-${wso2is_version}/bin/wso2is.sh</li>
+e.g., /identity/[EMAIL PROTECTED]@/bin/wso2is.sh</li>
<li>Check your WSO2 Identity Solution instance using the URL
https://localhost:12443</li>
</ol>
Modified:
trunk/solutions/identity/modules/documentation/src/site/xdoc/release-notes.xml
==============================================================================
---
trunk/solutions/identity/modules/documentation/src/site/xdoc/release-notes.xml
(original)
+++
trunk/solutions/identity/modules/documentation/src/site/xdoc/release-notes.xml
Sun Dec 9 23:55:35 2007
@@ -21,13 +21,13 @@
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
<meta http-equiv="content-type" content="" />
- <title>WSO2 Identity Solution ${wso2is_version} Release Notes</title>
+ <title>WSO2 Identity Solution @wso2is_version@ Release Notes</title>
<link href="./tools/cmd/css/wsas-dist-doc.css" rel="stylesheet"
type="text/css" media="all" />
</head>
<body>
-<h1>WSO2 Identity Solution ${wso2is_version} Release Notes</h1>
+<h1>WSO2 Identity Solution @wso2is_version@ Release Notes</h1>
<h3>04 October, 2007</h3>
Modified:
trunk/solutions/identity/modules/documentation/src/site/xdoc/rp_developer_guide.xml
==============================================================================
---
trunk/solutions/identity/modules/documentation/src/site/xdoc/rp_developer_guide.xml
(original)
+++
trunk/solutions/identity/modules/documentation/src/site/xdoc/rp_developer_guide.xml
Sun Dec 9 23:55:35 2007
@@ -19,7 +19,7 @@
<head>
</head>
<body>
-<h1>WSO2 Identity Solution, v${wso2is_version} : Java Servlet Filter Developer
Guide</h1>
+<h1>WSO2 Identity Solution, [EMAIL PROTECTED]@ : Java Servlet Filter Developer
Guide</h1>
<h2>Introduction</h2>
This servlet filter
org.wso2.solutions.identity.relyingparty.servletfilter.RelyingPartyFilter
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
