You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/10/25 05:38:18 UTC
svn commit: rev 55477 - in incubator/lenya/trunk: . src/documentation/content/xdocs src/documentation/content/xdocs/docs/components/asset-management src/documentation/content/xdocs/docs/components/editors src/java/org/apache/lenya/cms/cocoon/acting src/webapp src/webapp/lenya/pubs/blog src/webapp/lenya/pubs/blog/config/menus src/webapp/lenya/pubs/blog/resources/misc/bxeng src/webapp/lenya/pubs/blog/xslt/entry src/webapp/lenya/pubs/default src/webapp/lenya/pubs/default/config/menus src/webapp/lenya/pubs/docs-new/content/xdocs src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/asset-management src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/editors src/webapp/lenya/resources/misc/bxeng src/webapp/lenya/resources/misc/bxeng/inc src/webapp/lenya/xslt/bxeng
Author: gregor
Date: Sun Oct 24 20:38:18 2004
New Revision: 55477
Added:
incubator/lenya/trunk/src/documentation/content/xdocs/docs/components/editors/bxe.xml
- copied, changed from rev 55436, incubator/lenya/trunk/src/documentation/content/xdocs/docs/components/editors/bxeng.xml
incubator/lenya/trunk/src/webapp/lenya/pubs/blog/xslt/entry/bxe.xsl
- copied, changed from rev 55436, incubator/lenya/trunk/src/webapp/lenya/pubs/blog/xslt/entry/bxeng.xsl
incubator/lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap
- copied, changed from rev 55436, incubator/lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxeng.xmap
incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/editors/bxe.xml
- copied, changed from rev 55436, incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/editors/bxeng.xml
Removed:
incubator/lenya/trunk/src/documentation/content/xdocs/docs/components/editors/bxeng.xml
incubator/lenya/trunk/src/webapp/lenya/pubs/blog/xslt/entry/bxeng.xsl
incubator/lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxeng.xmap
incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/editors/bxeng.xml
Modified:
incubator/lenya/trunk/build.properties
incubator/lenya/trunk/src/documentation/content/xdocs/docs/components/asset-management/management.xml
incubator/lenya/trunk/src/documentation/content/xdocs/site.xml
incubator/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
incubator/lenya/trunk/src/webapp/global-sitemap.xmap
incubator/lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/entry.xsp
incubator/lenya/trunk/src/webapp/lenya/pubs/blog/resources/misc/bxeng/entry.xhtml
incubator/lenya/trunk/src/webapp/lenya/pubs/blog/sitemap.xmap
incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp
incubator/lenya/trunk/src/webapp/lenya/pubs/default/publication-sitemap.xmap
incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/asset-management/management.xml
incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/site.xml
incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/download.xhtml
incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/inc/config.xml
incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/index.xhtml
incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/aggregate.xsl
incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/index-xhtml.xsl
incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/link.xsl
Log:
bxeng -> bxe
Modified: incubator/lenya/trunk/build.properties
==============================================================================
--- incubator/lenya/trunk/build.properties (original)
+++ incubator/lenya/trunk/build.properties Sun Oct 24 20:38:18 2004
@@ -68,9 +68,6 @@
# Comma- or space-separated list of patterns
# All files are included when commented
-target.install.excludes=lenya/resources/bxeng/**,lenya/resources/kupu/**
-target.reset.excludes=lenya/resources/bxeng/**,lenya/resources/kupu/**
-
#target.install.excludes=**/default/**/authoring/**,**/default/**/live/**,**/default/config/ac/passwd/*.iml
#target.reset.excludes=**/default/**/authoring/**,**/default/**/live/**,**/default/config/ac/passwd/*.iml
Modified: incubator/lenya/trunk/src/documentation/content/xdocs/docs/components/asset-management/management.xml
==============================================================================
--- incubator/lenya/trunk/src/documentation/content/xdocs/docs/components/asset-management/management.xml (original)
+++ incubator/lenya/trunk/src/documentation/content/xdocs/docs/components/asset-management/management.xml Sun Oct 24 20:38:18 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: management.xml,v 1.1 2004/07/01 23:59:24 thorsten Exp $ -->
+<!-- $Id$ -->
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
@@ -88,7 +88,7 @@
<p>Images and assets can also be inserted from within the Bitflux editor.</p>
<p>The insertion is done via a XSLT stylesheet
- (<code>image.xsl</code> or <code>asset.xsl</code> in <code>xslt/bxeng</code>).
+ (<code>image.xsl</code> or <code>asset.xsl</code> in <code>xslt/bxe</code>).
These stylesheets create a popup window that let the user select an asset or image
and insert it into the currently opened document via javascript.</p>
</section>
Copied: incubator/lenya/trunk/src/documentation/content/xdocs/docs/components/editors/bxe.xml (from rev 55436, incubator/lenya/trunk/src/documentation/content/xdocs/docs/components/editors/bxeng.xml)
==============================================================================
--- incubator/lenya/trunk/src/documentation/content/xdocs/docs/components/editors/bxeng.xml (original)
+++ incubator/lenya/trunk/src/documentation/content/xdocs/docs/components/editors/bxe.xml Sun Oct 24 20:38:18 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: bxeng.xml,v 1.1 2004/07/01 23:59:21 thorsten Exp $ -->
+<!-- $Id$ -->
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
@@ -45,7 +45,7 @@
<section>
<title>Namespace declaration</title>
-<p>resources/misc/bxeng/*-namespaces.xml</p>
+<p>resources/misc/bxe/*-namespaces.xml</p>
</section>
</body>
Modified: incubator/lenya/trunk/src/documentation/content/xdocs/site.xml
==============================================================================
--- incubator/lenya/trunk/src/documentation/content/xdocs/site.xml (original)
+++ incubator/lenya/trunk/src/documentation/content/xdocs/site.xml Sun Oct 24 20:38:18 2004
@@ -79,7 +79,7 @@
label="HTML Form Editor"/>
<namespaces href="1form.html"
label="HTML One Form Editor"/>
- <namespaces href="bxeng.html" label="Bitflux Editor"/>
+ <namespaces href="bxe.html" label="Bitflux Editor"/>
<namespaces href="kupu.html" label="Kupu"/>
<namespaces href="xopus.html" label="Xopus"/>
</misc>
Modified: incubator/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java
==============================================================================
--- incubator/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java (original)
+++ incubator/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/RevisionControllerAction.java Sun Oct 24 20:38:18 2004
@@ -111,13 +111,13 @@
// the page-envelope
String documentid = document.getId();
- int bx = documentid.lastIndexOf("-bxeng");
+ int bx = documentid.lastIndexOf("-bxe");
if (bx > 0) {
String language = document.getLanguage();
int l = documentid.length();
- int bxLength = "-bxeng".length();
+ int bxLength = "-bxe".length();
int lang = documentid.lastIndexOf("_", bx);
int langLength = bx - lang;
Modified: incubator/lenya/trunk/src/webapp/global-sitemap.xmap
==============================================================================
--- incubator/lenya/trunk/src/webapp/global-sitemap.xmap (original)
+++ incubator/lenya/trunk/src/webapp/global-sitemap.xmap Sun Oct 24 20:38:18 2004
@@ -239,8 +239,8 @@
<!-- Editor BXE -->
<map:pipeline>
- <map:match pattern="bxeng/**">
- <map:read src="lenya/resources/bxeng/{1}"/>
+ <map:match pattern="bxe/**">
+ <map:read src="lenya/resources/bxe/{1}"/>
</map:match>
</map:pipeline>
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/entry.xsp
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/entry.xsp (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/blog/config/menus/entry.xsp Sun Oct 24 20:38:18 2004
@@ -53,7 +53,7 @@
<menu name="Edit">
<block>
<item uc:usecase="edit" href="?lenya.step=open&form=entry">With Forms</item>
- <item href="index-bxeng.html">With BXE</item>
+ <item href="index-bxe.html">With BXE</item>
<item uc:usecase="1formedit" href="?lenya.step=open">With one Form</item>
</block>
</menu>
@@ -62,7 +62,7 @@
<!--
<block>
<item uc:usecase="edit" href="?lenya.step=open&form=entry">Edit with Forms</item>
- <item href="index-bxeng.html">Edit with BXE</item>
+ <item href="index-bxe.html">Edit with BXE</item>
<item uc:usecase="1formedit" href="?lenya.step=open">Edit with one Form</item>
</block>
-->
@@ -102,11 +102,11 @@
<item href="http://www.feedvalidator.org">Feed Validator</item>
</block>
<block>
- <item href="index-bxeng.html">HTML for BXE</item>
- <item href="config-bxeng.xml">Config for BXE</item>
- <item href="entry-bxeng.xsl">XSLT for BXE</item>
- <item href="entry-bxeng.css">CSS for BXE</item>
- <item href="entry-relaxng-bxeng.xml">RelaxNG for BXE</item>
+ <item href="index-bxe.html">HTML for BXE</item>
+ <item href="config-bxe.xml">Config for BXE</item>
+ <item href="entry-bxe.xsl">XSLT for BXE</item>
+ <item href="entry-bxe.css">CSS for BXE</item>
+ <item href="entry-relaxng-bxe.xml">RelaxNG for BXE</item>
</block>
</menu>
</menus>
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/blog/resources/misc/bxeng/entry.xhtml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/blog/resources/misc/bxeng/entry.xhtml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/blog/resources/misc/bxeng/entry.xhtml Sun Oct 24 20:38:18 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: entry.xhtml,v 1.4 2004/03/13 12:31:34 gregor Exp $ -->
+<!-- $Id$ -->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -25,16 +25,16 @@
<meta name="bxeNS" content="echo=http://purl.org/atom/ns#" />
<meta name="bxeNS" content="ent=http://www.purl.org/NET/ENT/1.0/" />
-<link rel="stylesheet" href="/bxeng/css/editor.css" type="text/css" />
+<link rel="stylesheet" href="/bxe/css/editor.css" type="text/css" />
-<script src="/bxeng/bxeLoader.js" type="text/javascript"></script>
+<script src="/bxe/bxeLoader.js" type="text/javascript"></script>
<title>Bitflux Editor</title>
</head>
-<body onload="bxe_start('./config-bxeng.xml')">
+<body onload="bxe_start('./config-bxe.xml')">
<!-- everything in the following div element will be replaced -->
<div id="bxe_area">
<noscript>
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/blog/sitemap.xmap
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/blog/sitemap.xmap (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/blog/sitemap.xmap Sun Oct 24 20:38:18 2004
@@ -159,46 +159,46 @@
<!-- BX Editor: Entries -->
<map:pipeline>
- <map:match pattern="*/entries/*/*/*/*/index-bxeng.html">
+ <map:match pattern="*/entries/*/*/*/*/index-bxe.html">
<!-- Check for BXE -->
- <map:act type="resource-exists" src="../../resources/bxeng/bxeLoader.js">
- <map:aggregate element="bxeng">
- <map:part src="../../resources/misc/bxeng/index.xhtml"/>
- <map:part src="resources/misc/bxeng/entry-namespaces.xml"/>
+ <map:act type="resource-exists" src="../../resources/bxe/bxeLoader.js">
+ <map:aggregate element="bxe">
+ <map:part src="../../resources/misc/bxe/index.xhtml"/>
+ <map:part src="resources/misc/bxe/entry-namespaces.xml"/>
</map:aggregate>
- <map:transform src="../../xslt/bxeng/aggregate.xsl"/>
- <map:transform src="../../xslt/bxeng/index-xhtml.xsl">
- <map:parameter name="configfile" value="./config-bxeng.xml"/>
+ <map:transform src="../../xslt/bxe/aggregate.xsl"/>
+ <map:transform src="../../xslt/bxe/index-xhtml.xsl">
+ <map:parameter name="configfile" value="./config-bxe.xml"/>
<map:parameter name="context" value="{request:contextPath}"/>
</map:transform>
<map:serialize type="xhtml-iso-8859-1"/>
</map:act>
- <map:generate src="../../resources/misc/bxeng/download.xhtml"/>
+ <map:generate src="../../resources/misc/bxe/download.xhtml"/>
<map:serialize type="html"/>
</map:match>
</map:pipeline>
<map:pipeline>
- <map:match pattern="*/entries/*/*/*/*/config-bxeng.xml">
- <map:generate src="../../resources/misc/bxeng/inc/config.xml"/>
- <map:transform src="../../xslt/bxeng/config-xml.xsl">
+ <map:match pattern="*/entries/*/*/*/*/config-bxe.xml">
+ <map:generate src="../../resources/misc/bxe/inc/config.xml"/>
+ <map:transform src="../../xslt/bxe/config-xml.xsl">
<map:parameter name="BX_xmlfile" value="../../../../../../webdav/entries/{2}/{3}/{4}/{5}/index.xml"/>
- <map:parameter name="BX_xslfile" value="entry-bxeng.xsl"/>
- <map:parameter name="css" value="entry-bxeng.css"/>
+ <map:parameter name="BX_xslfile" value="entry-bxe.xsl"/>
+ <map:parameter name="css" value="entry-bxe.css"/>
<map:parameter name="BX_exitdestination" value="index.html"/>
- <map:parameter name="BX_validationfile" value="entry-relaxng-bxeng.xml"/>
+ <map:parameter name="BX_validationfile" value="entry-relaxng-bxe.xml"/>
</map:transform>
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
<map:pipeline>
- <map:match pattern="*/entries/*/*/*/*/entry-bxeng.xsl">
- <map:generate src="xslt/entry/bxeng.xsl"/>
+ <map:match pattern="*/entries/*/*/*/*/entry-bxe.xsl">
+ <map:generate src="xslt/entry/bxe.xsl"/>
<map:serialize type="xml"/>
</map:match>
- <map:match pattern="*/entries/*/*/*/*/entry-bxeng.css">
- <map:read src="resources/misc/bxeng/entry.css" mime-type="text/css"/>
+ <map:match pattern="*/entries/*/*/*/*/entry-bxe.css">
+ <map:read src="resources/misc/bxe/entry.css" mime-type="text/css"/>
</map:match>
- <map:match pattern="*/entries/*/*/*/*/entry-relaxng-bxeng.xml">
+ <map:match pattern="*/entries/*/*/*/*/entry-relaxng-bxe.xml">
<map:generate src="config/doctypes/schemas/entry.rng"/>
<map:serialize type="xml"/>
</map:match>
Copied: incubator/lenya/trunk/src/webapp/lenya/pubs/blog/xslt/entry/bxe.xsl (from rev 55436, incubator/lenya/trunk/src/webapp/lenya/pubs/blog/xslt/entry/bxeng.xsl)
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/blog/xslt/entry/bxeng.xsl (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/blog/xslt/entry/bxe.xsl Sun Oct 24 20:38:18 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: bxeng.xsl,v 1.4 2004/03/13 12:31:30 gregor Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:echo="http://purl.org/atom/ns#"
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/menus/generic.xsp Sun Oct 24 20:38:18 2004
@@ -132,14 +132,14 @@
<menu name="Edit Body">
<block>
<item wf:event="edit" uc:usecase="kupu" uc:step="open" href="?"><i18n:text>With Kupu</i18n:text></item>
- <item wf:event="edit" uc:usecase="bxeng" uc:step="open" href="?"><i18n:text>With BXE</i18n:text></item>
+ <item wf:event="edit" uc:usecase="bxe" uc:step="open" href="?"><i18n:text>With BXE</i18n:text></item>
<item wf:event="edit" uc:usecase="edit" uc:step="open"><xsp:attribute name="href"><xsp:expr>"?form=" + docType</xsp:expr></xsp:attribute><i18n:text>With Forms</i18n:text></item>
<item wf:event="edit" uc:usecase="1formedit" uc:step="open" href="?"><i18n:text>With one Form</i18n:text></item>
</block>
</menu>
<!--
<item wf:event="edit" uc:usecase="kupu" uc:step="open" href="?"><i18n:text>Edit with Kupu</i18n:text></item>
- <item wf:event="edit" uc:usecase="bxeng" uc:step="open" href="?"><i18n:text>Edit with BXE</i18n:text></item>
+ <item wf:event="edit" uc:usecase="bxe" uc:step="open" href="?"><i18n:text>Edit with BXE</i18n:text></item>
<item wf:event="edit" uc:usecase="edit" uc:step="open"><xsp:attribute name="href"><xsp:expr>"?form=" + docType</xsp:expr></xsp:attribute><i18n:text>Edit with Forms</i18n:text></item>
<item wf:event="edit" uc:usecase="1formedit" uc:step="open" href="?"><i18n:text>Edit with one Form</i18n:text></item>
-->
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/default/publication-sitemap.xmap
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/publication-sitemap.xmap (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/publication-sitemap.xmap Sun Oct 24 20:38:18 2004
@@ -91,8 +91,8 @@
<map:serialize type="xml"/>
</map:match>
- <map:match pattern="**/*-bxeng.css">
- <map:read mime-type="text/css" src="resources/misc/bxeng/{2}-bxeng.css"/>
+ <map:match pattern="**/*-bxe.css">
+ <map:read mime-type="text/css" src="resources/misc/bxe/{2}-bxe.css"/>
</map:match>
<map:handle-errors>
Copied: incubator/lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap (from rev 55436, incubator/lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxeng.xmap)
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxeng.xmap (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap Sun Oct 24 20:38:18 2004
@@ -91,17 +91,17 @@
<map:match pattern="request2document">
<map:generate type="stream"/>
- <map:transform src="../../xslt/bxeng/change-object-path-back.xsl">
+ <map:transform src="../../xslt/bxe/change-object-path-back.xsl">
<map:parameter name="documentid" value="{page-envelope:document-id}"/>
</map:transform>
<map:serialize type="xml-utf-8"/>
</map:match>
- <map:match type="usecase" pattern="bxeng">
+ <map:match type="usecase" pattern="bxe">
<map:match type="step" pattern="open">
- <!-- Check for BXENG -->
- <map:act type="resource-exists" src="../../resources/bxeng/bxeLoader.js">
+ <!-- Check for bxe -->
+ <map:act type="resource-exists" src="../../resources/bxe/bxeLoader.js">
<map:act type="reserved-checkout">
<map:generate type="serverpages" src="../../content/rc/{exception}.xsp">
<map:parameter name="user" value="{user}"/>
@@ -115,18 +115,18 @@
</map:transform>
<map:call resource="style-cms-page"/>
</map:act>
- <map:aggregate element="bxeng">
- <map:part src="../../resources/misc/bxeng/index.xhtml"/>
- <map:part src="../../resources/misc/bxeng/content-namespaces.xml"/>
+ <map:aggregate element="bxe">
+ <map:part src="../../resources/misc/bxe/index.xhtml"/>
+ <map:part src="../../resources/misc/bxe/content-namespaces.xml"/>
</map:aggregate>
- <map:transform src="../../xslt/bxeng/aggregate.xsl"/>
- <map:transform src="../../xslt/bxeng/index-xhtml.xsl">
- <map:parameter name="configfile" value="{request:requestURI}?lenya.usecase=bxeng&lenya.step=config"/>
+ <map:transform src="../../xslt/bxe/aggregate.xsl"/>
+ <map:transform src="../../xslt/bxe/index-xhtml.xsl">
+ <map:parameter name="configfile" value="{request:requestURI}?lenya.usecase=bxe&lenya.step=config"/>
<map:parameter name="context" value="{request:contextPath}"/>
</map:transform>
<map:serialize type="xhtml-iso-8859-1"/>
</map:act>
- <map:generate src="../../resources/misc/bxeng/download.xhtml"/>
+ <map:generate src="../../resources/misc/bxe/download.xhtml"/>
<map:call resource="style-cms-page"/>
<map:serialize type="html"/>
</map:match>
@@ -134,41 +134,41 @@
<map:match pattern="image-upload-show" type="step">
<map:call resource="cms-screen">
<map:parameter name="serverpage" value="info/assets.xsp"/>
- <map:parameter name="stylesheet" value="bxeng/image.xsl"/>
+ <map:parameter name="stylesheet" value="bxe/image.xsl"/>
</map:call>
</map:match>
<map:match pattern="asset-upload-show" type="step">
<map:call resource="cms-screen">
<map:parameter name="serverpage" value="info/assets.xsp"/>
- <map:parameter name="stylesheet" value="bxeng/asset.xsl"/>
+ <map:parameter name="stylesheet" value="bxe/asset.xsl"/>
</map:call>
</map:match>
<map:match type="step" pattern="asset-upload">
<map:act type="upload">
- <map:redirect-to uri="{request:requestURI}?lenya.usecase=bxeng&lenya.step=asset-upload-show"/>
+ <map:redirect-to uri="{request:requestURI}?lenya.usecase=bxe&lenya.step=asset-upload-show"/>
</map:act>
<map:call resource="cms-screen">
<map:parameter name="serverpage" value="info/assets.xsp"/>
- <map:parameter name="stylesheet" value="bxeng/asset.xsl"/>
+ <map:parameter name="stylesheet" value="bxe/asset.xsl"/>
</map:call>
</map:match>
<map:match type="step" pattern="image-upload">
<map:act type="upload">
- <map:redirect-to uri="{request:requestURI}?lenya.usecase=bxeng&lenya.step=image-upload-show"/>
+ <map:redirect-to uri="{request:requestURI}?lenya.usecase=bxe&lenya.step=image-upload-show"/>
</map:act>
<map:call resource="cms-screen">
<map:parameter name="serverpage" value="info/assets.xsp"/>
- <map:parameter name="stylesheet" value="bxeng/image.xsl"/>
+ <map:parameter name="stylesheet" value="bxe/image.xsl"/>
</map:call>
</map:match>
<map:match pattern="link-show" type="step">
<!-- just a dummy xsp since we call the info area directly -->
<map:generate type="serverpages" src="../../content/info/assets.xsp"/>
- <map:transform src="../../xslt/bxeng/link.xsl" label="content">
+ <map:transform src="../../xslt/bxe/link.xsl" label="content">
<map:parameter name="infoarea" value="true"/>
<map:parameter name="contextprefix" value="{request:contextPath}"/>
<map:parameter name="publicationid" value="{page-envelope:publication-id}"/>
@@ -195,7 +195,7 @@
<map:parameter name="defaultlanguage" value="{page-envelope:default-language}"/>
</map:transform>
- <map:transform src="../../xslt/bxeng/sitetree2tree.xsl" label="content">
+ <map:transform src="../../xslt/bxe/sitetree2tree.xsl" label="content">
<map:parameter name="contextprefix" value="{request:contextPath}"/>
<map:parameter name="publicationid" value="{page-envelope:publication-id}"/>
<map:parameter name="chosenlanguage" value="{request-param:language}"/>
@@ -209,9 +209,9 @@
<map:match pattern="**/*.html">
<!-- configuration -->
<map:match type="step" pattern="config">
- <map:generate src="../../resources/misc/bxeng/inc/config.xml"/>
- <map:transform src="../../xslt/bxeng/config-xml.xsl">
- <map:parameter name="BX_xmlfile" value="{request:requestURI}?lenya.usecase=bxeng&lenya.step=xml"/>
+ <map:generate src="../../resources/misc/bxe/inc/config.xml"/>
+ <map:transform src="../../xslt/bxe/config-xml.xsl">
+ <map:parameter name="BX_xmlfile" value="{request:requestURI}?lenya.usecase=bxe&lenya.step=xml"/>
<map:parameter name="defaultlanguage" value="{page-envelope:default-language}"/>
<!-- Instead of an xsl we use the xhtml file to provide the basic layout
@@ -219,12 +219,12 @@
-->
<map:parameter name="BX_xhtmlfile" value="{../2}.bxe.html"/>
<map:parameter name="BX_validationfile" value="{request:contextPath}/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}.rng"/>
- <map:parameter name="css" value="{request:contextPath}/{page-envelope:publication-id}/{page-envelope:area}/css/{page-envelope:document-type}-bxeng.css"/>
+ <map:parameter name="css" value="{request:contextPath}/{page-envelope:publication-id}/{page-envelope:area}/css/{page-envelope:document-type}-bxe.css"/>
<!-- The document is checked in when we exit from bx (in case of save&exit and in case of exit), so we use the usecase
for the checkin while we redirect to the document
-->
<map:parameter name="BX_exitdestination" value="{request:requestURI}?lenya.usecase=checkin&lenya.step=checkin&backup=true"/>
- <map:parameter name="contextmenufile" value="../../resources/misc/bxeng/contextmenu.xml"/>
+ <map:parameter name="contextmenufile" value="../../resources/misc/bxe/contextmenu.xml"/>
</map:transform>
<map:transform type="cinclude"/>
<map:serialize type="xml"/>
@@ -258,7 +258,7 @@
<map:otherwise> <!-- GET -->
<map:generate src="content/authoring/{page-envelope:document-path}"/>
- <map:transform src="../../xslt/bxeng/change-object-path.xsl">
+ <map:transform src="../../xslt/bxe/change-object-path.xsl">
<map:parameter name="documentid" value="{page-envelope:document-id}"/>
</map:transform>
<map:serialize type="xml"/>
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/asset-management/management.xml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/asset-management/management.xml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/asset-management/management.xml Sun Oct 24 20:38:18 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: management.xml,v 1.4 2004/03/13 12:42:21 gregor Exp $ -->
+<!-- $Id$ -->
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
@@ -88,7 +88,7 @@
<p>Images and assets can also be inserted from within the Bitflux editor.</p>
<p>The insertion is done via a XSLT stylesheet
- (<code>image.xsl</code> or <code>asset.xsl</code> in <code>xslt/bxeng</code>).
+ (<code>image.xsl</code> or <code>asset.xsl</code> in <code>xslt/bxe</code>).
These stylesheets create a popup window that let the user select an asset or image
and insert it into the currently opened document via javascript.</p>
</section>
Copied: incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/editors/bxe.xml (from rev 55436, incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/editors/bxeng.xml)
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/editors/bxeng.xml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/docs/components/editors/bxe.xml Sun Oct 24 20:38:18 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: bxeng.xml,v 1.2 2004/03/13 12:48:14 gregor Exp $ -->
+<!-- $Id$ -->
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
@@ -45,7 +45,7 @@
<section>
<title>Namespace declaration</title>
-<p>resources/misc/bxeng/*-namespaces.xml</p>
+<p>resources/misc/bxe/*-namespaces.xml</p>
</section>
</body>
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/site.xml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/site.xml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/docs-new/content/xdocs/site.xml Sun Oct 24 20:38:18 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: site.xml,v 1.60 2004/05/24 11:39:11 andreas Exp $ -->
+<!-- $Id$ -->
<site xmlns="http://apache.org/forrest/linkmap/1.0" href="" label="Lenya">
<home href="index.html">Home</home>
@@ -60,7 +60,7 @@
<misc href="editors/" label="Editors">
<namespaces href="htmlform.html" label="HTML Form Editor"/>
<namespaces href="1form.html" label="HTML One Form Editor"/>
- <namespaces href="bxeng.html" label="Bitflux Editor"/>
+ <namespaces href="bxe.html" label="Bitflux Editor"/>
<namespaces href="kupu.html" label="Kupu"/>
<namespaces href="xopus.html" label="Xopus"/>
</misc>
Modified: incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/download.xhtml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/download.xhtml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/download.xhtml Sun Oct 24 20:38:18 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: download.xhtml,v 1.10 2004/05/19 15:45:13 gregor Exp $ -->
+<!-- $Id$ -->
<page:page
xmlns:page="http://apache.org/cocoon/lenya/cms-page/1.0">
@@ -24,11 +24,11 @@
<page:body>
<div class="lenya-box">
<br />Please <a href="http://bxe.oscom.org/download/">download Bitflux Editor</a> and copy the
- contents of the tarball to the <em>webapps/lenya/lenya/resources/bxeng</em> directory.
+ contents of the tarball to the <em>webapps/lenya/lenya/resources/bxe</em> directory.
<p>
No further setup is required.
<br /><br />
-If you use Jetty, copy the contents of the tarball to the <em>build/lenya/webapps/lenya/resources/bxeng</em> directory.
+If you use Jetty, copy the contents of the tarball to the <em>build/lenya/webapps/lenya/resources/bxe</em> directory.
<br /><br />
Many thanks to the <a href="http://bxe.oscom.org">Bitflux Editor community</a> for making this great tool available.
</p>
Modified: incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/inc/config.xml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/inc/config.xml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/inc/config.xml Sun Oct 24 20:38:18 2004
@@ -15,19 +15,19 @@
limitations under the License.
-->
-<!-- $Id: config.xml,v 1.26 2004/09/03 12:56:55 andreas Exp $ -->
+<!-- $Id$ -->
<config>
<files>
<input>
<!-- The XML-document with the actual data -->
- <file name="BX_xmlfile">index-bxeng.xml</file>
+ <file name="BX_xmlfile">index-bxe.xml</file>
<!-- The xhtml with the appropriate div tag (e.g. <div bxe_xpath="/xhtml:html/lenya:meta/dc:title" />)
An xhtml file can be used instead of an xsl to provide the page layout of the non-editable part -->
<file name="BX_xhtmlfile">testxhtml.xml</file>
<!-- The XSL-document which transforms the xml to the output format -->
- <file name="BX_xslfile">entry-bxeng.xsl</file>
+ <file name="BX_xslfile">entry-bxe.xsl</file>
<!-- The RelaxNG (XML Schema) -->
<file name="BX_validationfile">relaxng.xml</file>
</input>
@@ -39,7 +39,7 @@
<!-- You can't provide a different "method" than http.get for the following files -->
<css>
<!-- Document specific css, which you should adjust. -->
- <file>entry-bxeng.css</file>
+ <file>entry-bxe.css</file>
</css>
@@ -98,10 +98,10 @@
<button name="Asset" col="2" row="6" action="InsertAsset"/>
</buttons>
<callbacks>
- <element name="object" ns="http://www.w3.org/1999/xhtml" type="popup">?lenya.usecase=bxeng&lenya.step=image-upload-show</element>
- <element name="img" ns="http://www.w3.org/1999/xhtml" type="popup">?lenya.usecase=bxeng&lenya.step=image-upload-show</element>
+ <element name="object" ns="http://www.w3.org/1999/xhtml" type="popup">?lenya.usecase=bxe&lenya.step=image-upload-show</element>
+ <element name="img" ns="http://www.w3.org/1999/xhtml" type="popup">?lenya.usecase=bxe&lenya.step=image-upload-show</element>
<element name="table" ns="http://www.w3.org/1999/xhtml" type="function">bxe_InsertTableCallback</element>
- <element name="asset" ns="http://apache.org/cocoon/lenya/page-envelope/1.0" type="popup">?lenya.usecase=bxeng&lenya.step=asset-upload-show</element>
- <element name="a" ns="http://www.w3.org/1999/xhtml" precheck="bxe_checkIfNotALink" type="popup">?lenya.usecase=bxeng&lenya.step=link-show</element>
+ <element name="asset" ns="http://apache.org/cocoon/lenya/page-envelope/1.0" type="popup">?lenya.usecase=bxe&lenya.step=asset-upload-show</element>
+ <element name="a" ns="http://www.w3.org/1999/xhtml" precheck="bxe_checkIfNotALink" type="popup">?lenya.usecase=bxe&lenya.step=link-show</element>
</callbacks>
</config>
Modified: incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/index.xhtml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/index.xhtml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/resources/misc/bxeng/index.xhtml Sun Oct 24 20:38:18 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: index.xhtml,v 1.5 2004/03/13 12:42:05 gregor Exp $ -->
+<!-- $Id$ -->
<html xmlns="http://www.w3.org/1999/xhtml" >
<head>
@@ -23,10 +23,10 @@
<!-- Namespaces are doctype specific and will be added during aggregation -->
<link rel="stylesheet" href="@EDITOR_CSS@" type="text/css" />
-<!-- href="/bxeng/css/editor.css" -->
+<!-- href="/bxe/css/editor.css" -->
<script src="@BXELOADER_JS@" type="text/javascript"></script>
-<!-- src="/bxeng/bxeLoader.js" -->
+<!-- src="/bxe/bxeLoader.js" -->
<title>Bitflux Editor</title>
Modified: incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/aggregate.xsl
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/aggregate.xsl (original)
+++ incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/aggregate.xsl Sun Oct 24 20:38:18 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: aggregate.xsl,v 1.3 2004/03/13 13:09:51 gregor Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -23,10 +23,10 @@
>
<xsl:template match="/">
-<xsl:apply-templates select="bxeng"/>
+<xsl:apply-templates select="bxe"/>
</xsl:template>
-<xsl:template match="bxeng">
+<xsl:template match="bxe">
<html xmlns="http://www.w3.org/1999/xhtml">
<xsl:apply-templates select="xhtml:html/xhtml:head"/>
<xsl:copy-of select="xhtml:html/xhtml:body"/>
@@ -35,7 +35,7 @@
<xsl:template match="xhtml:head">
<head xmlns="http://www.w3.org/1999/xhtml">
-<xsl:for-each select="/bxeng/namespaces/xmlns">
+<xsl:for-each select="/bxe/namespaces/xmlns">
<meta name="bxeNS" content="{.}"/>
</xsl:for-each>
<xsl:copy-of select="@*|node()"/>
Modified: incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/index-xhtml.xsl
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/index-xhtml.xsl (original)
+++ incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/index-xhtml.xsl Sun Oct 24 20:38:18 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: index-xhtml.xsl,v 1.3 2004/03/13 13:09:51 gregor Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -34,11 +34,11 @@
</xsl:template>
<xsl:template match="xhtml:head/xhtml:link/@href">
- <xsl:attribute name="href"><xsl:value-of select="$context"/>/bxeng/css/editor.css</xsl:attribute>
+ <xsl:attribute name="href"><xsl:value-of select="$context"/>/bxe/css/editor.css</xsl:attribute>
</xsl:template>
<xsl:template match="xhtml:head/xhtml:script/@src">
- <xsl:attribute name="src"><xsl:value-of select="$context"/>/bxeng/bxeLoader.js</xsl:attribute>
+ <xsl:attribute name="src"><xsl:value-of select="$context"/>/bxe/bxeLoader.js</xsl:attribute>
</xsl:template>
<xsl:template match="@*|node()">
Modified: incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/link.xsl
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/link.xsl (original)
+++ incubator/lenya/trunk/src/webapp/lenya/xslt/bxeng/link.xsl Sun Oct 24 20:38:18 2004
@@ -16,7 +16,7 @@
-->
<!--
- $Id: link.xsl,v 1.12 2004/08/25 14:48:22 andreas Exp $
+ $Id$
-->
<xsl:stylesheet version="1.0"
@@ -47,7 +47,7 @@
<page:body>
<script type="text/javascript" src="{$contextprefix}/{$publicationid}/{$area}/info-sitetree/ua.js"> </script>
<script type="text/javascript" src="{$contextprefix}/{$publicationid}/{$area}/info-sitetree/tree.js"> </script>
- <script type="text/javascript" src="{$contextprefix}/{$publicationid}/{$area}/{$documenturl}?lenya.usecase=bxeng&lenya.step=link-tree&language={$chosenlanguage}"> </script>
+ <script type="text/javascript" src="{$contextprefix}/{$publicationid}/{$area}/{$documenturl}?lenya.usecase=bxe&lenya.step=link-tree&language={$chosenlanguage}"> </script>
<script>
var url;
window.onload = insertText
@@ -167,7 +167,7 @@
<xsl:text>?lenya.usecase=</xsl:text>
<xsl:choose>
<xsl:when test="$tab"><xsl:value-of select="$tab"/></xsl:when>
- <xsl:otherwise>bxeng</xsl:otherwise>
+ <xsl:otherwise>bxe</xsl:otherwise>
</xsl:choose>
<xsl:text>&lenya.step=link-show</xsl:text>
</xsl:template>
@@ -209,7 +209,7 @@
<xsl:template name="activate">
<xsl:param name="tablanguage"/>
- <xsl:attribute name="href"><xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$area"/><xsl:value-of select="$documentid"/>_<xsl:value-of select="$tablanguage"/><xsl:value-of select="$extension"/>?lenya.usecase=bxeng&lenya.step=link-show</xsl:attribute>
+ <xsl:attribute name="href"><xsl:value-of select="$contextprefix"/>/<xsl:value-of select="$publicationid"/>/<xsl:value-of select="$area"/><xsl:value-of select="$documentid"/>_<xsl:value-of select="$tablanguage"/><xsl:value-of select="$extension"/>?lenya.usecase=bxe&lenya.step=link-show</xsl:attribute>
<xsl:attribute name="class">lenya-tablink<xsl:choose><xsl:when test="$chosenlanguage = $tablanguage">-active</xsl:when><xsl:otherwise/></xsl:choose></xsl:attribute><xsl:value-of select="$tablanguage"/>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org