headers
bdelacretaz | 1 Oct 2005 16:39
Picon
Favicon
Gravatar

svn commit: r292989 - in /cocoon/whiteboard/example-apps/bricks-cms: ./ lib/textile4j/ lib/textile4j/textile4j-1.20/ src/cocoon/webapp/bricks-cms/admin/document-editor/flow/ src/cocoon/webapp/bricks-cms/admin/document-editor/forms/ src/cocoon/webapp/br...

Author: bdelacretaz
Date: Sat Oct  1 07:39:33 2005
New Revision: 292989

URL: http://svn.apache.org/viewcvs?rev=292989&view=rev
Log:
Wiki text support added, using textile4j

Added:
    cocoon/whiteboard/example-apps/bricks-cms/lib/textile4j/
    cocoon/whiteboard/example-apps/bricks-cms/lib/textile4j/textile4j-1.20/
    cocoon/whiteboard/example-apps/bricks-cms/lib/textile4j/textile4j-1.20/textile4j-1.20-LICENSE.txt

cocoon/whiteboard/example-apps/bricks-cms/lib/textile4j/textile4j-1.20/textile4j-1.20-with-source.jar
  (with props)
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/flow/example-text.js
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/wikiparser/
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/wikiparser/TextParser.java
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/wikiparser/impl/
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/wikiparser/impl/TextileTextParserImpl.java
Modified:
    cocoon/whiteboard/example-apps/bricks-cms/STATUS.TXT
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/flow/document-editor.js
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-template.xml
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/document.jx.xml
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/xslt/page-to-html.xsl
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/common/component-manager.js
    cocoon/whiteboard/example-apps/bricks-cms/src/misc/hivemind/hivemodule.xml
(Continue reading)

Permalink | Reply | 0 comments |
headers
bdelacretaz | 1 Oct 2005 18:06
Picon
Favicon
Gravatar

svn commit: r292992 - in /cocoon/whiteboard/example-apps/bricks-cms/src: cocoon/webapp/bricks-cms/admin/document-editor/ cocoon/webapp/bricks-cms/admin/document-editor/flow/ cocoon/webapp/bricks-cms/admin/document-editor/forms/ cocoon/webapp/bricks-cms...

Author: bdelacretaz
Date: Sat Oct  1 09:05:52 2005
New Revision: 292992

URL: http://svn.apache.org/viewcvs?rev=292992&view=rev
Log:
Search function implemented, improved navigation when editing documents

Added:
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/flow/search.js
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/search-results.jx.xml
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/xslt/search-results-to-page.xsl
Modified:
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/document-editor-homepage.xml
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/forms/document-template.xml
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/sitemap.xmap
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/view/document.jx.xml
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/pages/admin-homepage.xml
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/ObjectStore.java
    cocoon/whiteboard/example-apps/bricks-cms/src/java/org/apache/cocoon/apps/bricks/cms/objectstore/impl/OjbObjectStore.java

Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/document-editor-homepage.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/document-editor-homepage.xml?rev=292992&r1=292991&r2=292992&view=diff
==============================================================================
---
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/document-editor-homepage.xml (original)
+++
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/document-editor/document-editor-homepage.xml
Sat Oct  1 09:05:52 2005
(Continue reading)

Permalink | Reply | 0 comments |
headers
bdelacretaz | 1 Oct 2005 18:24
Picon
Favicon
Gravatar

svn commit: r292995 - in /cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin: static-content/resources/css/bricks-cms.css xslt/page-to-html.xsl xslt/search-results-to-page.xsl

Author: bdelacretaz
Date: Sat Oct  1 09:24:25 2005
New Revision: 292995

URL: http://svn.apache.org/viewcvs?rev=292995&view=rev
Log:
page footer added

Modified:
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/xslt/page-to-html.xsl
    cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/xslt/search-results-to-page.xsl

Modified: cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css?rev=292995&r1=292994&r2=292995&view=diff
==============================================================================
---
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css (original)
+++
cocoon/whiteboard/example-apps/bricks-cms/src/cocoon/webapp/bricks-cms/admin/static-content/resources/css/bricks-cms.css
Sat Oct  1 09:24:25 2005
 <at>  <at>  -77,4 +77,10  <at>  <at> 
 .evenRow
 {
     background-color: #FFFFCC;
-}
\ No newline at end of file
+}
+
+#footer {
(Continue reading)

Permalink | Reply | 0 comments |
headers
danielf | 1 Oct 2005 21:34
Picon
Favicon

svn commit: r293017 - in /cocoon/trunk: ./ src/java/ src/java/org/apache/cocoon/core/osgi/ src/osgi-servlet/ src/osgi-servlet/org/apache/cocoon/service/servlet/impl/ src/webapp/

Author: danielf
Date: Sat Oct  1 12:33:44 2005
New Revision: 293017

URL: http://svn.apache.org/viewcvs?rev=293017&view=rev
Log:
Followed Vadim's ideas and moved creation of Core and Cocoon from the cocoon bundle to the webapp bundle.
Core and Cocoon are registred as OSGi services through the ECM/OSGi Service adapters and used in the
osgi-servlet bundle. Also cleaned up manifests, imports and whitespace.

Modified:
    cocoon/trunk/init.xargs
    cocoon/trunk/src/java/Manifest.mf
    cocoon/trunk/src/java/org/apache/cocoon/core/osgi/CoreBlockActivator.java
    cocoon/trunk/src/java/org/apache/cocoon/core/osgi/OSGiBootstrapEnvironment.java
    cocoon/trunk/src/java/org/apache/cocoon/core/osgi/OSGiCoreServiceManager.java
    cocoon/trunk/src/java/org/apache/cocoon/core/osgi/ServiceManagerActivator.java
    cocoon/trunk/src/osgi-servlet/Manifest.mf
    cocoon/trunk/src/osgi-servlet/org/apache/cocoon/service/servlet/impl/Activator.java
    cocoon/trunk/src/webapp/Manifest.mf

Modified: cocoon/trunk/init.xargs
URL: http://svn.apache.org/viewcvs/cocoon/trunk/init.xargs?rev=293017&r1=293016&r2=293017&view=diff
==============================================================================
--- cocoon/trunk/init.xargs (original)
+++ cocoon/trunk/init.xargs Sat Oct  1 12:33:44 2005
 <at>  <at>  -68,5 +68,5  <at>  <at> 
 -start lib/core/knopflerfish-frameworkcommands-1.0.0.jar
 -start lib/core/knopflerfish-logcommands-1.0.0.jar
 -start lib/core/knopflerfish-http_all-1.1.0.jar
(Continue reading)

Permalink | Reply | 0 comments |
headers
bdelacretaz | 2 Oct 2005 00:05
Picon
Favicon
Gravatar

svn commit: r293032 - /cocoon/whiteboard/example-apps/bricks-cms/README.TXT

Author: bdelacretaz
Date: Sat Oct  1 15:05:02 2005
New Revision: 293032

URL: http://svn.apache.org/viewcvs?rev=293032&view=rev
Log:
Use the public http URL for Subversion, and update instructions for today's changes

Modified:
    cocoon/whiteboard/example-apps/bricks-cms/README.TXT

Modified: cocoon/whiteboard/example-apps/bricks-cms/README.TXT
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/example-apps/bricks-cms/README.TXT?rev=293032&r1=293031&r2=293032&view=diff
==============================================================================
--- cocoon/whiteboard/example-apps/bricks-cms/README.TXT (original)
+++ cocoon/whiteboard/example-apps/bricks-cms/README.TXT Sat Oct  1 15:05:02 2005
 <at>  <at>  -38,7 +38,7  <at>  <at> 
  - JDK 1.4.x (tested with 1.4.2_05 on macosx).
  - ant 1.6.1, see below.
  - The bricks-cms code, obviously, which currently resides at
-    https://svn.apache.org/repos/asf/cocoon/whiteboard/example-apps/bricks-cms/
+    http://svn.apache.org/repos/asf/cocoon/whiteboard/example-apps/bricks-cms/

 
 CONFIGURING
 <at>  <at>  -107,18 +107,10  <at>  <at> 
 -Follow the links to the the main bricks-cms application and to
  the document editor (http://localhost:8888/bricks-cms/admin/document-editor/)

--From that page, create a document and note its ID
(Continue reading)

Permalink | Reply | 0 comments |
headers
crossley | 2 Oct 2005 09:55
Picon
Favicon

svn commit: r293079 - in /cocoon/blocks/validation/trunk/WEB-INF/sitemap-additions: ./ cocoon-validation.xconf

Author: crossley
Date: Sun Oct  2 00:55:21 2005
New Revision: 293079

URL: http://svn.apache.org/viewcvs?rev=293079&view=rev
Log:
Needed "sitemap-additions" for c-2.2

Added:
    cocoon/blocks/validation/trunk/WEB-INF/sitemap-additions/
    cocoon/blocks/validation/trunk/WEB-INF/sitemap-additions/cocoon-validation.xconf
      - copied, changed from r293074, cocoon/blocks/validation/trunk/conf/validation.xmap

Copied: cocoon/blocks/validation/trunk/WEB-INF/sitemap-additions/cocoon-validation.xconf
(from r293074, cocoon/blocks/validation/trunk/conf/validation.xmap)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/validation/trunk/WEB-INF/sitemap-additions/cocoon-validation.xconf?p2=cocoon/blocks/validation/trunk/WEB-INF/sitemap-additions/cocoon-validation.xconf&p1=cocoon/blocks/validation/trunk/conf/validation.xmap&r1=293074&r2=293079&rev=293079&view=diff
==============================================================================
--- cocoon/blocks/validation/trunk/conf/validation.xmap (original)
+++ cocoon/blocks/validation/trunk/WEB-INF/sitemap-additions/cocoon-validation.xconf Sun Oct  2
00:55:21 2005
 <at>  <at>  -15,10 +15,9  <at>  <at> 
   limitations under the License.
 -->

-<xmap xmlns:map="http://apache.org/cocoon/sitemap/1.0"
-      xpath="/sitemap/components/transformers"
-      unless="transformer[ <at> name='validate']">
+<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">

+<map:transformers>
(Continue reading)

Permalink | Reply | 0 comments |
headers
reinhard | 2 Oct 2005 14:32
Picon
Favicon

svn commit: r293102 - in /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow: ContinuationsManagerImpl.java WebContinuation.java

Author: reinhard
Date: Sun Oct  2 05:32:38 2005
New Revision: 293102

URL: http://svn.apache.org/viewcvs?rev=293102&view=rev
Log:
make ContinuationsManagerImpl extensible so that it is possible to implement your own continuations
invalidation strategy; code formatting

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?rev=293102&r1=293101&r2=293102&view=diff
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java (original)
+++
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Sun Oct  2 05:32:38 2005
 <at>  <at>  -77,7 +77,7  <at>  <at> 
         extends AbstractLogEnabled
         implements ContinuationsManager, Component, Configurable,
                    ThreadSafe, Instrumentable, Serviceable, Contextualizable {
-
+    
     static final int CONTINUATION_ID_LENGTH = 20;
     static final String EXPIRE_CONTINUATIONS = "expire-continuations";
(Continue reading)

Permalink | Reply | 3 comments |
headers
reinhard | 2 Oct 2005 14:40
Picon
Favicon

svn commit: r293103 - in /cocoon/branches/BRANCH_2_1_X/src: blocks/apples/java/org/apache/cocoon/components/flow/apples/ blocks/apples/samples/ blocks/apples/samples/calc/ webapp/samples/flow/jxcalc/screens/

Author: reinhard
Date: Sun Oct  2 05:40:28 2005
New Revision: 293103

URL: http://svn.apache.org/viewcvs?rev=293103&view=rev
Log:
remove dependency of Apples samples on XSP; unfortunalty this makes a switch to the old expression style in
the 'jxcalc'-samples templates necessary - maybe one of the jxt gurus has an idea what needs to be changed

Removed:
    cocoon/branches/BRANCH_2_1_X/src/blocks/apples/samples/calc/
Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/apples/samples/sitemap.xmap
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/displayResult.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberA.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getNumberB.xml
    cocoon/branches/BRANCH_2_1_X/src/webapp/samples/flow/jxcalc/screens/getOperator.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java?rev=293103&r1=293102&r2=293103&view=diff
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java (original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
Sun Oct  2 05:40:28 2005
 <at>  <at>  -61,7 +61,7  <at>  <at> 

         DefaultContext appleContext = new DefaultContext(avalonContext);
(Continue reading)

Permalink | Reply | 2 comments |
headers
jeremy | 2 Oct 2005 14:41
Picon
Favicon

svn commit: r293104 - in /cocoon/blocks: ajax/trunk/java/org/apache/cocoon/ajax/resources/js/ ajax/trunk/java/org/apache/cocoon/ajax/resources/macros/ ajax/trunk/samples/ ajax/trunk/samples/i18n/ forms/trunk/java/org/apache/cocoon/forms/resources/ form...

Author: jeremy
Date: Sun Oct  2 05:41:05 2005
New Revision: 293104

URL: http://svn.apache.org/viewcvs?rev=293104&view=rev
Log:
Updating CForms to use the prototype.js lib for all AJAX work.
Adding TimedBrowserUpdater and sample to the Ajax Block

Added:
    cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/browserupdater.js
    cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/domutils.js
    cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/timedbrowserupdater.js
    cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/macros/
    cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/macros/timedbrowserupdater.xml
    cocoon/blocks/ajax/trunk/samples/i18n/
    cocoon/blocks/ajax/trunk/samples/i18n/timedbrowserupdater.xml
    cocoon/blocks/ajax/trunk/samples/timed-updater.xml
Modified:
    cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/cocoon-ajax.js
    cocoon/blocks/ajax/trunk/samples/flow.js
    cocoon/blocks/ajax/trunk/samples/sitemap.xmap
    cocoon/blocks/ajax/trunk/samples/welcome.xml
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/resources/forms-field-styling.xsl
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/resources/js/cforms.js
    cocoon/blocks/forms/trunk/samples/sitemap.xmap

Added: cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/browserupdater.js
URL: http://svn.apache.org/viewcvs/cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/browserupdater.js?rev=293104&view=auto
==============================================================================
(Continue reading)

Permalink | Reply | 0 comments |
headers
jeremy | 2 Oct 2005 15:09
Picon
Favicon

svn commit: r293107 - in /cocoon/blocks: ajax/trunk/java/org/apache/cocoon/ajax/resources/js/ ajax/trunk/java/org/apache/cocoon/ajax/resources/macros/ forms/trunk/java/org/apache/cocoon/forms/resources/ forms/trunk/java/org/apache/cocoon/forms/resource...

Author: jeremy
Date: Sun Oct  2 06:09:18 2005
New Revision: 293107

URL: http://svn.apache.org/viewcvs?rev=293107&view=rev
Log:
Added JavaScript NameSpacing to the CForms and BrowserUpdater Classes, to avoid conflict between our
stuff and the Libraries we are using.

Modified:
    cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/browserupdater.js
    cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/cocoon-ajax.js
    cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/timedbrowserupdater.js
    cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/macros/timedbrowserupdater.xml
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/resources/forms-field-styling.xsl
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/resources/js/cforms.js

Modified: cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/browserupdater.js
URL: http://svn.apache.org/viewcvs/cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/browserupdater.js?rev=293107&r1=293106&r2=293107&view=diff
==============================================================================
--- cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/browserupdater.js (original)
+++ cocoon/blocks/ajax/trunk/java/org/apache/cocoon/ajax/resources/js/browserupdater.js Sun
Oct  2 06:09:18 2005
 <at>  <at>  -17,8 +17,8  <at>  <at> 
 /*  <at> version $Id$ */

 
-BrowserUpdater = Class.create();
-Object.extend(Object.extend(BrowserUpdater.prototype, Ajax.Request.prototype), {
+Cocoon.Ajax.BrowserUpdater = Class.create();
(Continue reading)

Permalink | Reply | 0 comments |

Gmane