Author: ilgrosso
Date: Tue May 29 14:38:44 2012
New Revision: 1343750
URL: http://svn.apache.org/viewvc?rev=1343750&view=rev
Log:
Updating site generation for (new) servlet-service + fixing links to servlet-service and cocoon-configuration
Removed:
cocoon/trunk/site/cocoon-servlet-service-site/
Modified:
cocoon/trunk/site/cocoon-22-site/src/site/xdoc/index.xml
cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1257_1_1.xml
cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1258_1_1.xml
cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1259_1_1.xml
cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1261_1_1.xml
cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1399_1_1.xml
cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1416_1_1.xml
cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1421_1_1.xml
cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1445_1_1.xml
cocoon/trunk/site/cocoon-main-site/src/site/xdoc/news-c3-alpha-1-released.xml
cocoon/trunk/site/cocoon-subprojects-site/src/site/xdoc/index.xml
cocoon/trunk/site/pom.xml
Modified: cocoon/trunk/site/cocoon-22-site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-22-site/src/site/xdoc/index.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-22-site/src/site/xdoc/index.xml (original)
+++ cocoon/trunk/site/cocoon-22-site/src/site/xdoc/index.xml Tue May 29 14:38:44 2012
@@ -39,9 +39,9 @@
both can be reused outside of Cocoon Core.
<br/>
The
- <a href="../subprojects/configuration/1.0/1329_1_1.html">Spring Configurator</a> provides basic support for
+ <a href="../subprojects/configuration/index.html">Spring Configurator</a> provides basic support for
configuring web applications that make use of Spring. The
- <a href="../subprojects/servlet-service/1.1/1325_1_1.html">Servlet Service Framework</a> enables modularization based
+ <a href="../subprojects/servlet-service/servlet-service-impl/index.html">Servlet Service Framework</a> enables modularization based
on the
<tt>javax.servlet.Servlet</tt> interface. Those servlet services are
<a href="http://en.wikipedia.org/wiki/Polymorphism_in_object-oriented_programming">polymorphic</a>.
Modified: cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1257_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1257_1_1.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1257_1_1.xml (original)
+++ cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1257_1_1.xml Tue May 29 14:38:44 2012
@@ -21,7 +21,7 @@ describing loggin configuration. Is ther
could we remove this document?</div></div><p>Cocoon uses <a href="http://jakarta.apache.org/commons/logging/">Commons
Logging</a> by default and provides support for using Log4j (through commons
logging). The usual Cocoon web application sets up Log4j through the
-<a href="../../../../subprojects/configuration/1.0/spring-configurator/2.0/1303_1_1.html">Cocoon Spring Configurator</a>.</p><p>The default configuration for Log4j is in the global application context
+<a href="../../../../subprojects/configuration/spring-configurator/index.html">Cocoon Spring Configurator</a>.</p><p>The default configuration for Log4j is in the global application context
definition. Cocoon loads <em>WEB-INF/cocoon/log4j.xconf</em> as the
configuration for Log4J. If you want to make any changes to the configuration
file, it is advisable to not alter this default file but instead use your own
Modified: cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1258_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1258_1_1.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1258_1_1.xml (original)
+++ cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1258_1_1.xml Tue May 29 14:38:44 2012
@@ -73,7 +73,7 @@ features of Spring 2.0:</p><pre><bean
</beans>
</pre><p>The two elements shown above are required to get Cocoon up and running inside
your web application. The first one, <tt>configurator:settings</tt>, initializes
-the <a href="../../../../subprojects/configuration/1.0/spring-configurator/2.0/1304_1_1.html">Cocoon Spring-Configurator.</a> The second element,
+the <a href="../../../../subprojects/configuration/spring-configurator/index.html">Cocoon Spring-Configurator.</a> The second element,
<tt>avalon:bridge</tt>, sets up the Spring-Avalon-Bridge. This bridge allows you
to run Avalon-based components in a Spring container; these Avalon components
are configured using the well-known Avalon-configuration files. And that's it.
@@ -83,6 +83,6 @@ context is up and running, Cocoon is rea
provided servlets to map requests to Cocoon or you can integrate Cocoon into
your web application framework by getting the Cocoon beans from the Spring
application context.</p><p>For more information on how to configure Cocoon, we suggest to read the
-documentation about the <a href="../../../../subprojects/configuration/1.0/spring-configurator/2.0/1304_1_1.html">Cocoon Spring Configurator</a>
+documentation about the <a href="../../../../subprojects/configuration/spring-configurator/index.html">Cocoon Spring Configurator</a>
first and then continue with the other configuration documents.</p></div></div>
</body></document>
\ No newline at end of file
Modified: cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1259_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1259_1_1.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1259_1_1.xml (original)
+++ cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1259_1_1.xml Tue May 29 14:38:44 2012
@@ -20,8 +20,8 @@
of components (the cocoon.xconf), the later versions support to split this
configuration file into several files using an include mechanism. You can refer
to properties from within your configuration files and Cocoon will replace these
-accordingly.</p><h1>Spring Configuration</h1><p>Spring configurations are supported through the <a href="../../../../subprojects/configuration/1.0/spring-configurator/2.0/1304_1_1.html">Spring
-Configurator</a>. Have a look at the <a href="../../../../subprojects/configuration/1.0/spring-configurator/2.0/1312_1_1.html">documentation</a> for
+accordingly.</p><h1>Spring Configuration</h1><p>Spring configurations are supported through the <a href="../../../../subprojects/configuration/spring-configurator/index.html">Spring
+Configurator</a>. Have a look at the <a href="../../../../subprojects/configuration/spring-configurator/index.html">documentation</a> for
more information.</p><h1>Legacy Configuration</h1><p>Although Cocoon is moving away from the Avalon framework (which is of course
still supported for compatibility), still the main part of Cocoon is configured
by using the Avalon configuration file format. By default all configuration
Modified: cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1261_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1261_1_1.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1261_1_1.xml (original)
+++ cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1261_1_1.xml Tue May 29 14:38:44 2012
@@ -23,7 +23,7 @@ without changing the files itself you ca
refer to from within the configuration files (and sitemaps and your own code).
In addition, Cocoon provides integrated support for the Spring property override
mechanism.</p><p>Cocoon uses the Cocoon Spring Configurator for these features. You can find a
-complete description <a href="../../../../subprojects/configuration/1.0/spring-configurator/2.0/1304_1_1.html">here</a>. In short, you can define
+complete description <a href="../../../../subprojects/configuration/spring-configurator/index.html">here</a>. In short, you can define
various property files and have different ways of configuring these properties.
You can refer to the values of a property by using the common
<tt>${PROPERTY_NAME}</tt> syntax in your configuration files or sitemaps. You
Modified: cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1399_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1399_1_1.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1399_1_1.xml (original)
+++ cocoon/trunk/site/cocoon-core-site/core/2.2/src/site/xdoc/1399_1_1.xml Tue May 29 14:38:44 2012
@@ -29,7 +29,7 @@ dumped to log files:</p><ul>
<tt>ERROR</tt> or <tt>FATAL_ERROR</tt> so only very important events are logged
(like crashes). While developing an application you would probably like to see
much more. It's up to you to choose an approporiate log level; little
-experimantation will give you sense of each setting.<h1>Tweaking the configuration</h1>Configuration in Cocoon is handled by <a href="../../../../subprojects/configuration/1.0/spring-configurator/2.0/1304_1_1.html">Spring
+experimantation will give you sense of each setting.<h1>Tweaking the configuration</h1>Configuration in Cocoon is handled by <a href="../../../../subprojects/configuration/spring-configurator/index.html">Spring
configurator</a>, go there for general information.<section name="How to set up a log level" style="background:none;padding:0;"/><div class="note"><div><strong>Note: </strong>Instructions put below assume that you have created a block
according to this <a href="../../../../2.2/1159_1_1.html">tutorial</a>. Please refer to it, first.
</div></div>Steps that you need to perform:<ol type="1">
Modified: cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1416_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1416_1_1.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1416_1_1.xml (original)
+++ cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1416_1_1.xml Tue May 29 14:38:44 2012
@@ -22,10 +22,10 @@ Cocoon. This relaunch comprises a new de
The new documentation reflects the new structure of <a href="2.2/1327_1_1.html">Cocoon
2.2</a> with a</p><ul>
<li>small <a href="2.2/core-modules/core/2.2/1270_1_1.html">core</a></li>
-<li>which is based on the <a href="subprojects/1306_1_1.html">subprojects</a>
-"<a href="subprojects/configuration/1.0/1329_1_1.html">Cocoon Configuration</a>" and
-"<a href="subprojects/servlet-service/1.0/1325_1_1.html">Cocoon Servlet-Service Framework</a>"</li>
-<li><a href="2.2/blocks/1204_1_1.html">blocks </a>with additional functionality (e.g. PDF or
+<li>which is based on the <a href="subprojects/">subprojects</a>
+"<a href="subprojects/configuration/">Cocoon Configuration</a>" and
+"<a href="subprojects/servlet-service/servlet-service-impl/">Cocoon Servlet-Service Framework</a>"</li>
+<li><a href="2.2/blocks/1204_1_1.html">blocks</a> with additional functionality (e.g. PDF or
SVG creation, form frameworks, etc.)</li>
<li>and <a href="2.2/maven-plugins/1208_1_1.html">Maven 2 plugins</a>.</li>
</ul>The content was also cleaned up so that information which had become
Modified: cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1421_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1421_1_1.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1421_1_1.xml (original)
+++ cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1421_1_1.xml Tue May 29 14:38:44 2012
@@ -67,7 +67,7 @@
which can communicate with each other. The current implementation is based on
Spring 2.0. There are no dependencies on Cocoon core libraries at all.
- http://cocoon.apache.org/subprojects/servlet-service/1.0/
+ http://cocoon.apache.org/subprojects/servlet-service/servlet-service-impl/
 * Cocoon Configuration 1.0.1
The Cocoon Configuration subproject provides basic support for configuring
@@ -75,7 +75,7 @@
useful component providing support in common configuration issues when using the
Spring framework. There are no dependencies on Cocoon core libraries at all.
- http://cocoon.apache.org/subprojects/configuration/1.0/
+ http://cocoon.apache.org/subprojects/configuration/
BLOCKS
------
Modified: cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1445_1_1.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1445_1_1.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1445_1_1.xml (original)
+++ cocoon/trunk/site/cocoon-main-site/src/site/xdoc/1445_1_1.xml Tue May 29 14:38:44 2012
@@ -73,7 +73,7 @@
There are no dependencies on Cocoon core libraries at all.
- http://cocoon.apache.org/subprojects/servlet-service/1.0/
+ http://cocoon.apache.org/subprojects/servlet-service/servlet-service-impl/
* Cocoon Configuration 1.0.2
The Cocoon Configuration subproject provides basic support for
@@ -83,7 +83,7 @@
There are no dependencies on Cocoon core libraries at all.
- http://cocoon.apache.org/subprojects/configuration/1.0/
+ http://cocoon.apache.org/subprojects/configuration/
Additional Cocoon 2.2.0 BLOCKS
------------------------------
Modified: cocoon/trunk/site/cocoon-main-site/src/site/xdoc/news-c3-alpha-1-released.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-main-site/src/site/xdoc/news-c3-alpha-1-released.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-main-site/src/site/xdoc/news-c3-alpha-1-released.xml (original)
+++ cocoon/trunk/site/cocoon-main-site/src/site/xdoc/news-c3-alpha-1-released.xml Tue May 29 14:38:44 2012
@@ -36,7 +36,7 @@ The Apache Cocoon Community is proud to
Here is an example of a pipeline that uses SAX components:
Pipeline pipeline = new NonCachingPipeline();
- pipeline.addComponent(new StringGenerator("<x></x>"));
+ pipeline.addComponent(new StringGenerator("<x></x>"));
pipeline.addComponent(new XSLTTransformer(
this.getClass().getResource("/test1.xslt")));
pipeline.addComponent(new XSLTTransformer(
Modified: cocoon/trunk/site/cocoon-subprojects-site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-subprojects-site/src/site/xdoc/index.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-subprojects-site/src/site/xdoc/index.xml (original)
+++ cocoon/trunk/site/cocoon-subprojects-site/src/site/xdoc/index.xml Tue May 29 14:38:44 2012
@@ -51,12 +51,12 @@
<tr class="b">
<td>
<p>
- <a href="servlet-service/1.0/index.html">Cocoon Servlet-Service-Framework</a>
+ <a href="servlet-service/servlet-service-impl/index.html">Cocoon Servlet-Service-Framework</a>
</p>
</td>
<td>
<p>
- <a href="servlet-service/1.0/index.html">1.0</a>
+ <a href="servlet-service/servlet-service-impl/index.html">1.0</a>
</p>
</td>
<td>
Modified: cocoon/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/pom.xml?rev=1343750&r1=1343749&r2=1343750&view=diff
==============================================================================
--- cocoon/trunk/site/pom.xml (original)
+++ cocoon/trunk/site/pom.xml Tue May 29 14:38:44 2012
@@ -77,7 +77,6 @@
<module>cocoon-core-site</module>
<module>cocoon-subprojects-site</module>
<module>cocoon-maven-plugins-site</module>
- <module>cocoon-servlet-service-site</module>
<module>cocoon-configuration-site</module>
</modules>
</profile>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.