Author: ptahchiev
Date: Wed Jan 30 00:22:45 2008
New Revision: 616681
URL: http://svn.apache.org/viewvc?rev=616681&view=rev
Log:
Changes on the site and the samples as well.
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works_uml.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml?rev=616681&r1=616680&r2=616681&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/pom.xml Wed Jan 30
00:22:45 2008
@@ -43,23 +43,12 @@
<url>https://issues.apache.org/jira/browse/CACTUS</url>
</issueManagement>
- <distributionManagement>
- <!--repository>
- <id>cactus-release</id>
- <name>Cactus's release repository</name>
-
<url>dav:https://dav.codehaus.org/repository/cargo/</url>
- </repository>
- <snapshotRepository>
- <id>cactus-snapshot</id>
- <name>Cactus's snapshot repository</name>
-
<url>dav:https://dav.codehaus.org/snapshots.repository/cargo/</url>
- </snapshotRepository>
- <site>
- <id>cactus-website</id>
-
<url>dav:https://dav.codehaus.org/cargo/maven-site/</url>
- </site-->
- </distributionManagement>
-
+ <distributionManagement>
+ <site>
+ <id>cactus.apache.org</id>
+ <url>file://C:/xampp/htdocs/cactus</url>
+ </site>
+ </distributionManagement>
<mailingLists>
<mailingList>
<name>Cactus User List</name>
@@ -209,7 +198,7 @@
<version>1.0-beta-2</version>
<executions>
<execution>
- <phase>site:run</phase>
+ <phase>site:deploy</phase>
<goals>
<goal>transform</goal>
</goals>
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works.xml?rev=616681&r1=616680&r2=616681&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works.xml
Wed Jan 30 00:22:45 2008
@@ -31,7 +31,7 @@
<section name="How it works">
<p>
- Click <a href="/how_it_works_uml.html">here</a> for a UML
+ Click <a href="how_it_works_uml.html">here</a> for a UML
sequence diagram.
</p>
@@ -143,7 +143,7 @@
If no exception occurred, the <code>YYYTestCase.runTest()</code>
method looks for an
<code>endXXX(org.apache.cactus.WebResponse)</code>
or <code>endXXX(com.meterware.httpunit.WebResponse)</code> method
(this
- signature is used for <a href="/writing/howto_httpunit.html">HttpUnit
+ signature is used for <a href="writing/howto_httpunit.html">HttpUnit
integration</a>) and executes it if found. At this stage,
you have the opportunity to check returned HTTP headers, Cookies and
the servlet output stream in the <code>endXXX()</code> method, again
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works_uml.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works_uml.xml?rev=616681&r1=616680&r2=616681&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works_uml.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/how_it_works_uml.xml
Wed Jan 30 00:22:45 2008
@@ -30,9 +30,9 @@
<section name="UML Sequence Diagram">
- <figure src="images/sequence.jpg" alt="UML Sequence Diagram"/>
+ <img src="images/sequence.jpg" alt="UML Sequence Diagram"/>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml?rev=616681&r1=616680&r2=616681&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml Wed Jan 30 00:22:45
2008
@@ -159,7 +159,7 @@
<site>
<id>cactus-server</id>
<name>Cactus Deployment Server</name>
- <url>scp://jakarta.apache.org/cactus/</url>
+ <url>scp://[EMAIL
PROTECTED]:/x1/www/jakarta.apache.org/cactus/</url>
</site>
</distributionManagement>
<!-- This is where the framework site is being deployed -->
Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties?rev=616681&r1=616680&r2=616681&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties
(original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/build.properties Wed
Jan 30 00:22:45 2008
@@ -26,7 +26,7 @@
#Container settings
-tomcat.container.home=/home/peter/bin/apache/apache-tomcat-6.0.9
+tomcat.container.home=C:/apache/tomcat/apache-tomcat-6.0.14
tomcat.container.id=tomcat5x
jboss.container.home=/home/peter/bin/jboss/jboss-4.0.2
jboss.container.id=jboss4x
@@ -37,4 +37,4 @@
reports.dir=${basedir}/target/reports
#Ivy properties
-ivy.lib.dir=${basedir}/target/lib
\ No newline at end of file
+ivy.lib.dir=${basedir}/target/lib
Modified:
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml?rev=616681&r1=616680&r2=616681&view=diff
==============================================================================
---
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
(original)
+++
jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/samples/samples-servlet/build.xml
Wed Jan 30 00:22:45 2008
@@ -150,7 +150,7 @@
<pathelement location="${build.dir}"/>
</classpath>
<containerset>
- <cargo containerId="${jboss.container.id}"
home="${jboss.container.home}" output="${logs.dir}/output.log"
+ <cargo containerId="${tomcat.container.id}"
home="${tomcat.container.home}" output="${logs.dir}/output.log"
log="${logs.dir}/cargo.log">
<configuration>
<property
name="cargo.servlet.port" value="${cargo.servlet.port}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
