You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2009/02/05 22:36:06 UTC
svn commit: r741303 - in /lenya/trunk:
org.apache.lenya.core.i18n/src/main/resources/
org.apache.lenya.core.i18n/src/main/resources/META-INF/
org.apache.lenya.core.i18n/src/main/resources/META-INF/cocoon/
org.apache.lenya.core.i18n/src/main/resources/M...
Author: andreas
Date: Thu Feb 5 21:36:06 2009
New Revision: 741303
URL: http://svn.apache.org/viewvc?rev=741303&view=rev
Log:
Adding sitemap component declarations and dependencies for global sitemap.
Added:
lenya/trunk/org.apache.lenya.core.i18n/src/main/resources/
lenya/trunk/org.apache.lenya.core.i18n/src/main/resources/META-INF/
lenya/trunk/org.apache.lenya.core.i18n/src/main/resources/META-INF/cocoon/
lenya/trunk/org.apache.lenya.core.i18n/src/main/resources/META-INF/cocoon/avalon/
lenya/trunk/org.apache.lenya.core.i18n/src/main/resources/META-INF/cocoon/avalon/lenya-core-i18n-sitemap.xconf
lenya/trunk/org.apache.lenya.core.linking/src/main/resources/
lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/
lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/
lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/avalon/
lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/avalon/lenya-core-linking-sitemap.xconf
Modified:
lenya/trunk/org.apache.lenya.parent/pom.xml
lenya/trunk/org.apache.lenya.welcome/pom.xml
lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/global-sitemap.xmap
Added: lenya/trunk/org.apache.lenya.core.i18n/src/main/resources/META-INF/cocoon/avalon/lenya-core-i18n-sitemap.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.i18n/src/main/resources/META-INF/cocoon/avalon/lenya-core-i18n-sitemap.xconf?rev=741303&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.i18n/src/main/resources/META-INF/cocoon/avalon/lenya-core-i18n-sitemap.xconf (added)
+++ lenya/trunk/org.apache.lenya.core.i18n/src/main/resources/META-INF/cocoon/avalon/lenya-core-i18n-sitemap.xconf Thu Feb 5 21:36:06 2009
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:transformers>
+ <map:transformer name="i18n" logger="sitemap.transformer.i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+ <catalogues default="cmsui">
+ <catalogue id="cmsui" name="cmsui" location="cocoon://modules/i18n/catalogue/"/>
+ </catalogues>
+ <untranslated-text>untranslated</untranslated-text>
+ <cache-at-startup>true</cache-at-startup>
+ </map:transformer>
+ </map:transformers>
+</map:components>
Added: lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/avalon/lenya-core-linking-sitemap.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/avalon/lenya-core-linking-sitemap.xconf?rev=741303&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/avalon/lenya-core-linking-sitemap.xconf (added)
+++ lenya/trunk/org.apache.lenya.core.linking/src/main/resources/META-INF/cocoon/avalon/lenya-core-linking-sitemap.xconf Thu Feb 5 21:36:06 2009
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:transformers>
+
+ <map:transformer name="uuid2url-xhtml" logger="lenya.sitemap.transformer.uuid2url"
+ src="org.apache.lenya.cms.cocoon.transformation.UuidToUrlTransformer">
+ <transform namespace="http://www.w3.org/1999/xhtml" element="a" attribute="href"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="object" attribute="data"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="img" attribute="src"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="link" attribute="href"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="form" attribute="action"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="script" attribute="src"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="input" attribute="src"/>
+ <markBrokenLinks attribute="class" value="brokenlink" messageAttribute="title"/>
+ </map:transformer>
+
+ <map:transformer name="url2uuid-xhtml" logger="lenya.sitemap.transformer.url2uuid"
+ src="org.apache.lenya.cms.cocoon.transformation.UrlToUuidTransformer">
+ <transform namespace="http://www.w3.org/1999/xhtml" element="a" attribute="href"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="object" attribute="data"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="img" attribute="src"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="link" attribute="href"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="form" attribute="action"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="script" attribute="src"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="input" attribute="src"/>
+ </map:transformer>
+
+ <map:transformer name="proxy-xhtml" logger="lenya.sitemap.transformer.proxy"
+ src="org.apache.lenya.cms.cocoon.transformation.ProxyTransformer">
+ <transform namespace="http://www.w3.org/1999/xhtml" element="a" attribute="href"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="object" attribute="data"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="img" attribute="src"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="link" attribute="href"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="form" attribute="action"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="script" attribute="src"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="input" attribute="src"/>
+ </map:transformer>
+
+ <map:transformer name="incoming-proxy-xhtml" logger="lenya.sitemap.transformer.incoming-proxy"
+ src="org.apache.lenya.cms.cocoon.transformation.IncomingProxyTransformer">
+ <transform namespace="http://www.w3.org/1999/xhtml" element="a" attribute="href"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="object" attribute="data"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="img" attribute="src"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="link" attribute="href"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="form" attribute="action"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="script" attribute="src"/>
+ <transform namespace="http://www.w3.org/1999/xhtml" element="input" attribute="src"/>
+ </map:transformer>
+
+ </map:transformers>
+</map:components>
Modified: lenya/trunk/org.apache.lenya.parent/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.parent/pom.xml?rev=741303&r1=741302&r2=741303&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.parent/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.parent/pom.xml Thu Feb 5 21:36:06 2009
@@ -176,6 +176,21 @@
<artifactId>spring-core</artifactId>
<version>2.5.5</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>1.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- Cocoon -->
<dependency>
@@ -250,6 +265,8 @@
</dependency>
<!-- Lenya -->
+
+ <!-- Core -->
<dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-ac</artifactId>
@@ -272,6 +289,16 @@
</dependency>
<dependency>
<groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-i18n</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-ldap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-linking</artifactId>
<version>${project.version}</version>
</dependency>
@@ -300,11 +327,8 @@
<artifactId>lenya-core-workflow</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.lenya</groupId>
- <artifactId>lenya-core-ldap</artifactId>
- <version>${project.version}</version>
- </dependency>
+
+ <!-- Modules -->
<dependency>
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-module-collection</artifactId>
@@ -345,21 +369,6 @@
<artifactId>lenya-welcome</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.4</version>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</dependencyManagement>
Modified: lenya/trunk/org.apache.lenya.welcome/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.welcome/pom.xml?rev=741303&r1=741302&r2=741303&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.welcome/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.welcome/pom.xml Thu Feb 5 21:36:06 2009
@@ -68,5 +68,13 @@
<groupId>org.apache.lenya</groupId>
<artifactId>lenya-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-i18n</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lenya</groupId>
+ <artifactId>lenya-core-linking</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/global-sitemap.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/global-sitemap.xmap?rev=741303&r1=741302&r2=741303&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/global-sitemap.xmap (original)
+++ lenya/trunk/org.apache.lenya.welcome/src/main/resources/COB-INF/global-sitemap.xmap Thu Feb 5 21:36:06 2009
@@ -25,7 +25,7 @@
<map:parameter name="locale" value="{request:locale}"/>
</map:transform>
<map:transform src="fallback://lenya/xslt/util/page2xhtml.xsl"/>
- <map:transform type="proxy"/>
+ <map:transform type="proxy-xhtml"/>
<map:transform src="context://lenya/xslt/util/strip_namespaces.xsl"/>
<map:transform src="fallback://lenya/modules/prettyprinting/xslt/xml2nicexml.xsl"/>
</map:resource>
@@ -59,7 +59,7 @@
src="fallback://lenya/chaperon/grammars/link.xlex"/>
<map:transform
src="fallback://lenya/chaperon/stylesheets/pattern-to-link.xsl"/>
- <map:transform type="proxy"/>
+ <map:transform type="proxy-xhtml"/>
<map:transform
src="fallback://lenya/chaperon/stylesheets/a-to-txt.xsl"/>
<map:serialize type="text" mime-type="text/css"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org