svn commit: r164911 - /cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java /cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/LoggerImpl.java /cocoon/branches/BRANCH_2_1_X/status.xml

2005-04-27 Thread vgritsenko
Author: vgritsenko
Date: Tue Apr 26 16:31:43 2005
New Revision: 164911

URL: http://svn.apache.org/viewcvs?rev=164911view=rev
Log:
add support for ojb 1.1 (interfaces changed)

Modified:

cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java

cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/LoggerImpl.java
cocoon/branches/BRANCH_2_1_X/status.xml

Modified: 
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java
URL: 
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java?rev=164911r1=164910r2=164911view=diff
==
--- 
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java
 (original)
+++ 
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java
 Tue Apr 26 16:31:43 2005
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
@@ -49,6 +49,22 @@
 /** The codeServiceSelector/code to be used */
 private static ServiceSelector datasources;
 
+/** The codeJdbcConnectionDescriptor/code */
+private JdbcConnectionDescriptor conDesc;
+
+/**
+ * Default constructor
+ */
+public ConnectionFactoryImpl() {
+}
+
+/**
+ * OJB 1.1 constructor
+ */
+public ConnectionFactoryImpl(JdbcConnectionDescriptor conDesc) {
+this.conDesc = conDesc;
+}
+
 public void service(ServiceManager manager) throws ServiceException {
 ConnectionFactoryImpl.manager = manager;
 ConnectionFactoryImpl.datasources = (ServiceSelector) 
manager.lookup(DataSourceComponent.ROLE + Selector);
@@ -62,9 +78,31 @@
 }
 }
 
-/* (non-Javadoc)
- * @see 
org.apache.ojb.broker.accesslayer.ConnectionFactory#lookupConnection(org.apache.ojb.broker.metadata.JdbcConnectionDescriptor)
- */
+//
+// OJB 1.1 ConnectionFactory Implementation
+//
+
+public Connection lookupConnection()
+throws LookupException {
+return lookupConnection(this.conDesc);
+}
+
+public void releaseConnection(Connection connection) {
+releaseConnection(this.conDesc, connection);
+}
+
+public int getActiveConnections() {
+return 0;
+}
+
+public int getIdleConnections() {
+return 0;
+}
+
+//
+// OJB 1.0 ConnectionFactory Implementation
+//
+
 public Connection lookupConnection(final JdbcConnectionDescriptor conDesc)
 throws LookupException {
 if (ConnectionFactoryImpl.manager == null) {
@@ -82,22 +120,16 @@
 }
 }
 
-/* (non-Javadoc)
- * @see 
org.apache.ojb.broker.accesslayer.ConnectionFactory#releaseConnection(org.apache.ojb.broker.metadata.JdbcConnectionDescriptor,
 java.sql.Connection)
- */
-public void releaseConnection(JdbcConnectionDescriptor conDesc, Connection 
con) {
+public void releaseConnection(JdbcConnectionDescriptor conDesc, Connection 
connection) {
 try {
 // The DataSource of this connection will take care of pooling
-con.close();
+connection.close();
 } catch (final SQLException e) {
 // This should not happen, but in case
 throw new CascadingRuntimeException(Cannot release SQL Connection 
to DataSource, e);
 }
 }
 
-/* (non-Javadoc)
- * @see 
org.apache.ojb.broker.accesslayer.ConnectionFactory#releaseAllResources()
- */
 public void releaseAllResources() {
 // Nothing to do here
 }

Modified: 
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/LoggerImpl.java
URL: 
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/LoggerImpl.java?rev=164911r1=164910r2=164911view=diff
==
--- 
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/LoggerImpl.java
 (original)
+++ 
cocoon/branches/BRANCH_2_1_X/src/blocks/ojb/java/org/apache/cocoon/ojb/components/LoggerImpl.java
 Tue Apr 26 16:31:43 2005
@@ -32,8 +32,8 @@
  * @version $Id$
  */
 public class LoggerImpl extends AbstractLogEnabled
- implements Component, ThreadSafe, 
Initializable,
-Logger {
+implements Component, ThreadSafe, Initializable,
+   Logger {
 
 /**
  * Root logger for all OJB loggers
@@ -162,13 +162,13 

svn commit: r164912 - in /cocoon/blocks/unsupported/ojb/trunk/java/org/apache/cocoon/ojb/components: ConnectionFactoryImpl.java LoggerImpl.java

2005-04-27 Thread vgritsenko
Author: vgritsenko
Date: Tue Apr 26 16:33:26 2005
New Revision: 164912

URL: http://svn.apache.org/viewcvs?rev=164912view=rev
Log:
add support for ojb 1.1 (interfaces changed)

Modified:

cocoon/blocks/unsupported/ojb/trunk/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java

cocoon/blocks/unsupported/ojb/trunk/java/org/apache/cocoon/ojb/components/LoggerImpl.java

Modified: 
cocoon/blocks/unsupported/ojb/trunk/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java
URL: 
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/ojb/trunk/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java?rev=164912r1=164911r2=164912view=diff
==
--- 
cocoon/blocks/unsupported/ojb/trunk/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java
 (original)
+++ 
cocoon/blocks/unsupported/ojb/trunk/java/org/apache/cocoon/ojb/components/ConnectionFactoryImpl.java
 Tue Apr 26 16:33:26 2005
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2002,2004-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
@@ -49,6 +49,22 @@
 /** The codeServiceSelector/code to be used */
 private static ServiceSelector datasources;
 
+/** The codeJdbcConnectionDescriptor/code */
+private JdbcConnectionDescriptor conDesc;
+
+/**
+ * Default constructor
+ */
+public ConnectionFactoryImpl() {
+}
+
+/**
+ * OJB 1.1 constructor
+ */
+public ConnectionFactoryImpl(JdbcConnectionDescriptor conDesc) {
+this.conDesc = conDesc;
+}
+
 public void service(ServiceManager manager) throws ServiceException {
 ConnectionFactoryImpl.manager = manager;
 ConnectionFactoryImpl.datasources = (ServiceSelector) 
manager.lookup(DataSourceComponent.ROLE + Selector);
@@ -62,9 +78,31 @@
 }
 }
 
-/* (non-Javadoc)
- * @see 
org.apache.ojb.broker.accesslayer.ConnectionFactory#lookupConnection(org.apache.ojb.broker.metadata.JdbcConnectionDescriptor)
- */
+//
+// OJB 1.1 ConnectionFactory Implementation
+//
+
+public Connection lookupConnection()
+throws LookupException {
+return lookupConnection(this.conDesc);
+}
+
+public void releaseConnection(Connection connection) {
+releaseConnection(this.conDesc, connection);
+}
+
+public int getActiveConnections() {
+return 0;
+}
+
+public int getIdleConnections() {
+return 0;
+}
+
+//
+// OJB 1.0 ConnectionFactory Implementation
+//
+
 public Connection lookupConnection(final JdbcConnectionDescriptor conDesc)
 throws LookupException {
 if (ConnectionFactoryImpl.manager == null) {
@@ -82,22 +120,16 @@
 }
 }
 
-/* (non-Javadoc)
- * @see 
org.apache.ojb.broker.accesslayer.ConnectionFactory#releaseConnection(org.apache.ojb.broker.metadata.JdbcConnectionDescriptor,
 java.sql.Connection)
- */
-public void releaseConnection(JdbcConnectionDescriptor conDesc, Connection 
con) {
+public void releaseConnection(JdbcConnectionDescriptor conDesc, Connection 
connection) {
 try {
 // The DataSource of this connection will take care of pooling
-con.close();
+connection.close();
 } catch (final SQLException e) {
 // This should not happen, but in case
 throw new CascadingRuntimeException(Cannot release SQL Connection 
to DataSource, e);
 }
 }
 
-/* (non-Javadoc)
- * @see 
org.apache.ojb.broker.accesslayer.ConnectionFactory#releaseAllResources()
- */
 public void releaseAllResources() {
 // Nothing to do here
 }

Modified: 
cocoon/blocks/unsupported/ojb/trunk/java/org/apache/cocoon/ojb/components/LoggerImpl.java
URL: 
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/ojb/trunk/java/org/apache/cocoon/ojb/components/LoggerImpl.java?rev=164912r1=164911r2=164912view=diff
==
--- 
cocoon/blocks/unsupported/ojb/trunk/java/org/apache/cocoon/ojb/components/LoggerImpl.java
 (original)
+++ 
cocoon/blocks/unsupported/ojb/trunk/java/org/apache/cocoon/ojb/components/LoggerImpl.java
 Tue Apr 26 16:33:26 2005
@@ -32,8 +32,8 @@
  * @version $Id$
  */
 public class LoggerImpl extends AbstractLogEnabled
- implements Component, ThreadSafe, 
Initializable,
-Logger {
+implements Component, ThreadSafe, Initializable,
+   Logger {
 
 /**
  * Root logger for all OJB loggers
@@ -162,13 +162,13 @@
 
 public void error(Object message) {
 if (ERROR = getLevel()) {
-

svn commit: r164913 - /cocoon/trunk/status.xml

2005-04-27 Thread vgritsenko
Author: vgritsenko
Date: Tue Apr 26 16:33:37 2005
New Revision: 164913

URL: http://svn.apache.org/viewcvs?rev=164913view=rev
Log:
add support for ojb 1.1 (interfaces changed)

Modified:
cocoon/trunk/status.xml

Modified: cocoon/trunk/status.xml
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=164913r1=164912r2=164913view=diff
==
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Tue Apr 26 16:33:37 2005
@@ -427,6 +427,9 @@
   /release
   release version=2.1.8 date=TBD
 action dev=VG type=update
+  OJB Block: Added support for OJB 1.1.
+/action
+action dev=VG type=update
   AbstractSAXTransformer gets codetransformer-factory/code 
configuration
   parameter.
 /action




svn commit: r164958 - /cocoon/trunk/status.xml

2005-04-27 Thread lgawron
Author: lgawron
Date: Wed Apr 27 00:41:27 2005
New Revision: 164958

URL: http://svn.apache.org/viewcvs?rev=164958view=rev
Log:
add info about new JXTG to status.xml

Modified:
cocoon/trunk/status.xml

Modified: cocoon/trunk/status.xml
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=164958r1=164957r2=164958view=diff
==
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Wed Apr 27 00:41:27 2005
@@ -195,6 +195,10 @@
 
   changes
   release version=@version@ date=@date@
+   action dev=LG type=update
+ Removed o.a.c.generation.JXTemplateGenerator from core. 
+ Introduced o.a.c.template.jxtg.JXTemplateGenerator as the official 
templating language.
+   /action
action dev=VG type=remove
  Removed EventRecorder (in o.a.c.t.helpers package).
/action




svn commit: r164967 [3/3] - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: ./ OLD-achives/ OLD-committer/ OLD-committers/ OLD-contrib/ OLD-devinfo-merge-to-committer/ OLD-fr-mail-lists/ OLD-francais/ OLD-history/ OLD-hosting/ OLD-incubation/ OLD-index/ OLD-links/ OLD-livesites-1.x/ OLD-livesites-2.0/ OLD-livesites-2.1/ OLD-mail-archives/ OLD-mail-lists/ OLD-news/ OLD-pmc/ OLD-releasing/ OLD-versioning/

2005-04-27 Thread upayavira
Added: 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-versioning/content_en.html
URL: 
http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-versioning/content_en.html?rev=164967view=auto
==
--- 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-versioning/content_en.html
 (added)
+++ 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-versioning/content_en.html
 Wed Apr 27 03:07:09 2005
@@ -0,0 +1,364 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html
+head
+META http-equiv=Content-Type content=text/html; charset=UTF-8
+titleThe Apache Cocoon Versioning Manifesto - DRAFT/title
+link href=http://purl.org/DC/elements/1.0/; rel=schema.DC
+/head
+body
+
+div class=warningDRAFT INITIAL VERSION/div
+
+
+p
+  This document covers how the Cocoon project is versioned. 
+  Since Cocoon is a framework, it is very important to define a stable API 
+  for users and developers. However, we also need to move Cocoon forward, 
+  technologically. To balance these two needs, a strict policy of 
versioning 
+  is required, which users can rely upon to understand the limitations, 
+  restrictions, and the changes that can occur from one release to the 
next.
+/p
+
+
+h1Basics/h1
+  
+  
+p
+Versions are denoted using a standard triplet of integers: 
+  /p
+  
+p
+MAJOR.MINOR.PATCH. 
+  /p
+  
+p
+The basic intent is that MAJOR versions are incompatible, large-scale 
+upgrades of the API. MINOR versions retain usage and extension 
compatibility 
+with older minor versions, and changes in the PATCH level are 
perfectly 
+compatible, forwards and backwards.
+  /p
+  
+p
+Following the main design principle of Cocoon, the pyramid of 
contracts, 
+we distinguish between users and developers of Cocoon. A very rough 
distinction 
+between them is that a user writes the application using Cocoon 
without 
+coding Java. There is one exception to this rule: flow script - the 
java 
+script is also written by the user.
+  /p
+  
+p
+A developer codes Java and provides additional functionality for the 
user, 
+so a developer extends Cocoon.
+  /p
+  
+p
+Therefore we distinguish between usage compatibility (user API) and 
+extension compatibility (developer API). Both compatibility levels 
cover 
+some kind of source compatibility. Cocoon does not provide binary 
+compatibility. But as Cocoon is distributed as a source release that 
+you have to compile anyway, it's safer to compile your own application 
+code (if any) using the version of Cocoon that your application runs 
on.
+  /p
+  
+p
+There are several reasons why recompilation is recommended. We strongly
+advise to compile Cocoon (or any other Java application) with the same
+JDK that is later used in production.
+  /p
+  
+ul
+
+li
+  Ensures that you have reliable operating environment. For example if
+  you compile a Java application with JDK 1.4 in JDK 1.3 compatible 
mode
+  it still can happen that your application doesn't run properly with 
JDK 1.3!
+  This is not Cocoon specific!
+/li
+
+li
+  Allows you to easily configure which parts you want. The selection of
+  wanted blocks is currently evaluated at build time, so if you want
+  to have an additional block/remove a block in your Cocoon 
installation,
+  you have to rebuild Cocoon.
+/li
+
+li
+  You will get warned about deprecated parts of the API.
+/li
+  
+/ul
+
+
+h1Usage Compatibility/h1
+  
+  
+p
+
+emUsage/em compatibility guarantees that an application written by 
+a Cocoon user is compatible. All files developed by a typical Cocoon 
+user like xml files, sitemaps, stylesheets (elements and namespace 
declarations) 
+keep on being picked up by the machinery and are dealt with correctly 
+(sitemap semantics, generator/transformer-picked up elements, config 
+file entries...). 
+  /p
+  
+p
+In fact this should cover everything (including flow script) but 
except 
+your own Java code.
+  /p
+  
+p
+Applications that write against a particular version will remain usage 
+compatible against later versions, until the major number changes.
+  /p
+  
+p
+Writing an application against a version means that this application 
+does not use any deprecated API of that version. Therefore minor 
version 
+changes are only usage compatible from one minor version to the direct 
+

svn commit: r164967 [1/3] - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: ./ OLD-achives/ OLD-committer/ OLD-committers/ OLD-contrib/ OLD-devinfo-merge-to-committer/ OLD-fr-mail-lists/ OLD-francais/ OLD-history/ OLD-hosting/ OLD-incubation/ OLD-index/ OLD-links/ OLD-livesites-1.x/ OLD-livesites-2.0/ OLD-livesites-2.1/ OLD-mail-archives/ OLD-mail-lists/ OLD-news/ OLD-pmc/ OLD-releasing/ OLD-versioning/

2005-04-27 Thread upayavira
Author: upayavira
Date: Wed Apr 27 03:07:09 2005
New Revision: 164967

URL: http://svn.apache.org/viewcvs?rev=164967view=rev
Log:
Adding old 'site', for copying across into new place, just like c21- 
files 
in 2.2 documentation.


Added:
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committer/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committer/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committer/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committer/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committers/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committers/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committers/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-committers/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-contrib/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-contrib/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-contrib/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-contrib/meta.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-devinfo-merge-to-committer/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-devinfo-merge-to-committer/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-devinfo-merge-to-committer/content_en.html

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-devinfo-merge-to-committer/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-fr-mail-lists/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-fr-mail-lists/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-fr-mail-lists/content_en.html

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-fr-mail-lists/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-francais/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-francais/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-francais/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-francais/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-incubation/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-incubation/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-incubation/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-incubation/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/content_en.html

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/comments_en.xml

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/content_en.html

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/meta.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.1/


svn commit: r164967 [2/3] - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: ./ OLD-achives/ OLD-committer/ OLD-committers/ OLD-contrib/ OLD-devinfo-merge-to-committer/ OLD-fr-mail-lists/ OLD-francais/ OLD-history/ OLD-hosting/ OLD-incubation/ OLD-index/ OLD-links/ OLD-livesites-1.x/ OLD-livesites-2.0/ OLD-livesites-2.1/ OLD-mail-archives/ OLD-mail-lists/ OLD-news/ OLD-pmc/ OLD-releasing/ OLD-versioning/

2005-04-27 Thread upayavira
Added: 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html
URL: 
http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html?rev=164967view=auto
==
--- 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html 
(added)
+++ 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html 
Wed Apr 27 03:07:09 2005
@@ -0,0 +1,66 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html
+head
+META http-equiv=Content-Type content=text/html; charset=UTF-8
+titleThe Apache Cocoon Project/title
+link href=http://purl.org/DC/elements/1.0/; rel=schema.DC
+meta content=Cocoon Developers name=DC.Creator
+/head
+body
+
+h1Apache Cocoon/h1
+  
+  
+pApache Cocoon is a web development framework built around the concepts of
+  separation of concerns and component-based web development./p
+
+  
+pCocoon implements these concepts around the notion of 'component pipelines',
+  each component on the pipeline specializing on a particular operation. This
+  makes it possible to use a Lego(tm)-like approach in building web solutions,
+  hooking together components into pipelines without any required 
programming./p
+
+  
+pCocoon is web glue for your web application development needs. It is a 
glue
+  that keeps concerns separate and allows parallel evolution of all aspects of
+  a web application, improving development pace and reducing the chance of
+  conflicts./p
+
+  
+
+h1The Apache Cocoon Project/h1
+  
+  
+pThe emApache Cocoon Project/em is the open source community project
+  developing Apache Cocoon and Cocoon-based application frameworks. With strong
+  foundations in XML-based server-side web application frameworks, the Apache 
Cocoon
+  Project consists of a group of people that share common values on
+  collaboration-intensive and community-based quality open source development.
+  The Apache Cocoon Project is proud to share these values with its parent
+  organization: The Apache Software Foundation./p
+
+  
+pThe Apache Cocoon project currently consists of a href=2.1/Apache 
Cocoon/a
+  itself. The a class=external 
href=http://lenya.apache.org/;Lenya/a CMS, which is
+  now a top-level project, started its life at Apache as an
+  a href=community/incubation.htmlincubating/a Cocoon subproject./p
+  
+  
+pThe a href=link/index.htmllinks section/a also lists a number of 
Cocoon-related
+  projects and resources./p
+
+  
+
+h1Documentation/h1
+  
+  
+p
+The documentation is located in each module and on the website
+under each specific Cocoon version. There is also the community
+effort to maintain the extensive
+a class=external href=http://wiki.apache.org/cocoon/;Cocoon 
Wiki/a.
+  /p
+
+  
+/body
+/html

Added: cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/meta.xml
URL: 
http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/meta.xml?rev=164967view=auto
==
--- cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/meta.xml 
(added)
+++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/meta.xml Wed 
Apr 27 03:07:09 2005
@@ -0,0 +1,9 @@
+?xml version=1.0?
+meta
+  authors
+author contact=http://cocoon.apache.org;Cocoon Community/author
+  /authors
+  legacy
+original-filenameindex.html/original-filename
+  /legacy
+/meta

Added: 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/comments_en.xml
URL: 
http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/comments_en.xml?rev=164967view=auto
==
--- 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/comments_en.xml 
(added)
+++ 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/comments_en.xml 
Wed Apr 27 03:07:09 2005
@@ -0,0 +1,3 @@
+?xml version=1.0?
+comments
+/comments

Added: 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/content_en.html
URL: 
http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/content_en.html?rev=164967view=auto
==
--- 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/content_en.html 
(added)
+++ 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/content_en.html 
Wed Apr 27 03:07:09 2005
@@ -0,0 +1,47 @@
+!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+html
+head
+META http-equiv=Content-Type content=text/html; charset=UTF-8
+titleCocoon Links Overview/title
+link 

svn commit: r164976 - /cocoon/trunk/DESKTOP.INI

2005-04-27 Thread vgritsenko
Author: vgritsenko
Date: Wed Apr 27 05:50:44 2005
New Revision: 164976

URL: http://svn.apache.org/viewcvs?rev=164976view=rev
Log:
icon location (Bug #34645)

Modified:
cocoon/trunk/DESKTOP.INI

Modified: cocoon/trunk/DESKTOP.INI
URL: 
http://svn.apache.org/viewcvs/cocoon/trunk/DESKTOP.INI?rev=164976r1=164975r2=164976view=diff
==
--- cocoon/trunk/DESKTOP.INI (original)
+++ cocoon/trunk/DESKTOP.INI Wed Apr 27 05:50:44 2005
@@ -1,6 +1,6 @@
 ; see 
http://msdn.microsoft.com/library/en-us/shellcc/platform/shell/programmersguide/shell_basics/shell_basics_extending/custom.asp
 [.ShellClassInfo]
-IconFile=src\documentation\images\cocoon.ico
+IconFile=src\documentation\src\content\xdocs\images\cocoon.ico
 IconIndex=0
 ConfirmFileOp=0
 InfoTip=Apache Cocoon, the XML application framework!




svn commit: r165000 - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: OLD-links/ links/

2005-04-27 Thread upayavira
Author: upayavira
Date: Wed Apr 27 09:00:41 2005
New Revision: 165000

URL: http://svn.apache.org/viewcvs?rev=165000view=rev
Log:
Moving the links page (my first SVN move, hope it works!)

Added:
cocoon/whiteboard/doc-repos/global/src/content/xdocs/links/
  - copied from r164999, 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/
Removed:
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-links/



svn commit: r165005 - in /cocoon/whiteboard/doc-repos/global/src/content/xdocs: ./ OLD-achives/ OLD-history/ OLD-hosting/ OLD-index/ OLD-livesites-1.x/ OLD-livesites-2.0/ OLD-livesites-2.1/ OLD-news/ history/ hosting/ index/ links/ livesites-1.x/ livesites-2.0/ livesites-2.1/ news-archives/ news/

2005-04-27 Thread upayavira
Author: upayavira
Date: Wed Apr 27 09:11:04 2005
New Revision: 165005

URL: http://svn.apache.org/viewcvs?rev=165005view=rev
Log:
First pass at moving docs around in the 'global site' repository. More 
work to do yet.

Added:
cocoon/whiteboard/doc-repos/global/src/content/xdocs/history/
  - copied from r164999, 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/
  - copied from r164999, 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.html
  - copied, changed from r164999, 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-1.x/
  - copied from r164999, 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.0/
  - copied from r164999, 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.1/
  - copied from r164999, 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.1/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/news/
  - copied from r164999, 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-news/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/news-archives/
  - copied from r164999, 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/
Removed:
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-achives/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-history/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-hosting/

cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-1.x/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.0/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-livesites-2.1/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-news/
cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.xml
cocoon/whiteboard/doc-repos/global/src/content/xdocs/links/
Modified:
cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/content_en.html

cocoon/whiteboard/doc-repos/global/src/content/xdocs/livesites-2.1/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/news/content_en.html
cocoon/whiteboard/doc-repos/global/src/content/xdocs/site.xml

Modified: 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/content_en.html
URL: 
http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/content_en.html?rev=165005r1=164999r2=165005view=diff
==
--- 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/content_en.html 
(original)
+++ 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/hosting/content_en.html 
Wed Apr 27 09:11:04 2005
@@ -109,7 +109,7 @@
 Enter a meaningful title after the words Link Hosting:
 in the subject, provide a short summary of your site and do not forget
 to tell us the URL.
-You could also follow the a 
href=../community/contrib.htmlContributing/a
+You could also follow the a href=contributing.htmlContributing/a
 page to make it easier for everyone.
/p


Copied: 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.html 
(from r164999, 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html)
URL: 
http://svn.apache.org/viewcvs/cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.html?p2=cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.htmlp1=cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.htmlr1=164999r2=165005rev=165005view=diff
==
--- 
cocoon/whiteboard/doc-repos/global/src/content/xdocs/OLD-index/content_en.html 
(original)
+++ cocoon/whiteboard/doc-repos/global/src/content/xdocs/index/content_en.html 
Wed Apr 27 09:11:04 2005
@@ -40,13 +40,13 @@
   organization: The Apache Software Foundation./p
 
   
-pThe Apache Cocoon project currently consists of a href=2.1/Apache 
Cocoon/a
+pThe Apache Cocoon project currently consists of a href=2.2/Apache 
Cocoon/a
   itself. The a class=external 
href=http://lenya.apache.org/;Lenya/a CMS, which is
   now a top-level project, started its life at Apache as an
-  a href=community/incubation.htmlincubating/a Cocoon subproject./p
+  a class=external href=http://incubator.apache.org;incubating/a 
Cocoon subproject./p
   
   
-pThe a href=link/index.htmllinks section/a also lists a number of 
Cocoon-related
+pThe a