You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ja...@apache.org on 2008/04/04 11:47:59 UTC
svn commit: r644660 - in
/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron:
jx/meta.jx neutron.js usecase-neutron.xmap
Author: jann
Date: Fri Apr 4 02:47:49 2008
New Revision: 644660
URL: http://svn.apache.org/viewvc?rev=644660&view=rev
Log:
Updating neutron integration
Modified:
lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/jx/meta.jx
lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/neutron.js
lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/usecase-neutron.xmap
Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/jx/meta.jx
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/jx/meta.jx?rev=644660&r1=644659&r2=644660&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/jx/meta.jx (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/jx/meta.jx Fri Apr 4 02:47:49 2008
@@ -9,7 +9,7 @@
<dc:creator>${creator}</dc:creator>
<dc:coverage></dc:coverage>
<dc:description></dc:description>
- <dc:extent></dc:extent>
+ <dc:extent>${extent}</dc:extent>
<dc:identifier></dc:identifier>
<dc:subject></dc:subject>
<dc:relation></dc:relation>
Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/neutron.js
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/neutron.js?rev=644660&r1=644659&r2=644660&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/neutron.js (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/neutron.js Fri Apr 4 02:47:49 2008
@@ -91,7 +91,7 @@
var rc = flowHelper.getRevisionController(cocoon);
var identity = new Identity();
- var user = identity.getIdentity(cocoon.session).getUser();
+ var user = identity.getIdentity(cocoon.session).getUserReference();
var docToPathMapper = new DefaultDocumentIdToPathMapper();
var path = docToPathMapper.getPath(document.getId(), document.getLanguage());
@@ -148,7 +148,7 @@
var rc = flowHelper.getRevisionController(cocoon);
var identity = new Identity();
- var user = identity.getIdentity(cocoon.session).getUser();
+ var user = identity.getIdentity(cocoon.session).getUserReference();
var docToPathMapper = new DefaultDocumentIdToPathMapper();
var path = docToPathMapper.getPath(document.getId(), document.getLanguage());
Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/usecase-neutron.xmap
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/usecase-neutron.xmap?rev=644660&r1=644659&r2=644660&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/usecase-neutron.xmap (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/usecases/neutron/usecase-neutron.xmap Fri Apr 4 02:47:49 2008
@@ -38,7 +38,7 @@
<map:pipeline type="noncaching">
<map:match pattern="*.jx">
- <map:generate type="jx" src="lenya/usecases/neutron/jx/{1}.jx"/>
+ <map:generate type="jx" src="jx/{1}.jx"/>
<map:serialize type="xml"/>
</map:match>
@@ -53,7 +53,7 @@
</map:match>
- <map:match pattern="xml/**">
+ <map:match pattern="xmlsource/**">
<map:act type="resource-exists" src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{1}">
<map:generate src="context://lenya/pubs/{page-envelope:publication-id}/content/authoring/{../1}"/>
<map:serialize type="xml"/>
@@ -67,6 +67,9 @@
<map:generate type="jx" src="jx/exception-auth.jx">
<map:parameter name="base-url" value="http://{request:serverName}:{request:serverPort}{request:requestURI}"/>
</map:generate>
+ <map:act type="set-header">
+ <map:parameter name="WWW-Authenticate" value="Neutron-Auth"/>
+ </map:act>
<map:serialize type="xml" status-code="401"/>
</map:match>
@@ -81,7 +84,7 @@
<map:match type="usecase" pattern="neutron">
<map:match type="step" pattern="introspect">
- <map:generate type="jx" src="{fallback:usecases/neutron/jx/introspection.jx}">
+ <map:generate type="jx" src="jx/introspection.jx">
<map:parameter name="base-url" value="{page-envelope:context-prefix}/{page-envelope:publication-id}/authoring"/>
<map:parameter name="document-url" value="{page-envelope:document-url}"/>
<map:parameter name="document-label" value="{page-envelope:document-label}"/>
@@ -108,22 +111,6 @@
<map:match type="step" pattern="checkin">
<map:call function="checkin"/>
- </map:match>
-
- <map:match type="step" pattern="xsl">
- <map:act src="context://lenya/pubs/{page-envelope:publication-id}/lenya/usecases/neutron/neutron-styles.xmap" type="resource-exists">
- <map:mount check-reload="true" reload-method="synchron" src="context://lenya/pubs/{page-envelope:publication-id}/lenya/usecases/neutron/neutron-styles.xmap" uri-prefix=""/>
- </map:act>
- <map:generate src="context://lenya/content/util/empty.xml"/>
- <map:serialize status-code="404"/>
- </map:match>
-
- <map:match type="step" pattern="template">
- <map:act src="context://lenya/pubs/{page-envelope:publication-id}/lenya/usecases/neutron/neutron-styles.xmap" type="resource-exists">
- <map:mount check-reload="true" reload-method="synchron" src="context://lenya/pubs/{page-envelope:publication-id}/lenya/usecases/neutron/neutron-styles.xmap" uri-prefix=""/>
- </map:act>
- <map:generate src="context://lenya/content/util/empty.xml"/>
- <map:serialize status-code="404"/>
</map:match>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org