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 2007/04/23 15:07:23 UTC
svn commit: r531457 - in /lenya/trunk/src: modules-core/ac/
modules-core/ac/config/ modules-core/acusecases/
modules-core/acusecases/config/ modules-core/administration/
modules-core/administration/config/ modules-core/cache/
modules-core/cache/config/...
Author: andreas
Date: Mon Apr 23 06:07:01 2007
New Revision: 531457
URL: http://svn.apache.org/viewvc?view=rev&rev=531457
Log:
Moved <module>/module.xml to <module>/config/
Added:
lenya/trunk/src/modules-core/ac/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/ac/module.xml
lenya/trunk/src/modules-core/acusecases/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/acusecases/module.xml
lenya/trunk/src/modules-core/administration/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/administration/module.xml
lenya/trunk/src/modules-core/cache/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/cache/module.xml
lenya/trunk/src/modules-core/janitor/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/janitor/module.xml
lenya/trunk/src/modules-core/ldap/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/ldap/module.xml
lenya/trunk/src/modules-core/linking/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/linking/module.xml
lenya/trunk/src/modules-core/observation/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/observation/module.xml
lenya/trunk/src/modules-core/properties/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/properties/module.xml
lenya/trunk/src/modules-core/sitemanagement/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/sitemanagement/module.xml
lenya/trunk/src/modules-core/templating/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/templating/module.xml
lenya/trunk/src/modules-core/usecase/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/usecase/module.xml
lenya/trunk/src/modules-core/workflow/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-core/workflow/module.xml
lenya/trunk/src/modules-legacy/task/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-legacy/task/module.xml
lenya/trunk/src/modules-optional/jcrsource/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules-optional/jcrsource/module.xml
lenya/trunk/src/modules/blog/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/blog/module.xml
lenya/trunk/src/modules/bxe/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/bxe/module.xml
lenya/trunk/src/modules/cforms/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/cforms/module.xml
lenya/trunk/src/modules/collection/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/collection/module.xml
lenya/trunk/src/modules/contactform/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/contactform/module.xml
lenya/trunk/src/modules/development/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/development/module.xml
lenya/trunk/src/modules/editors/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/editors/module.xml
lenya/trunk/src/modules/export/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/export/module.xml
lenya/trunk/src/modules/fckeditor/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/fckeditor/module.xml
lenya/trunk/src/modules/kupu/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/kupu/module.xml
lenya/trunk/src/modules/languageselector/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/languageselector/module.xml
lenya/trunk/src/modules/lenyadoc/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/lenyadoc/module.xml
lenya/trunk/src/modules/linkcheck/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/linkcheck/module.xml
lenya/trunk/src/modules/links/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/links/module.xml
lenya/trunk/src/modules/lucene/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/lucene/module.xml
lenya/trunk/src/modules/migration/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/migration/module.xml
lenya/trunk/src/modules/neutron/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/neutron/module.xml
lenya/trunk/src/modules/news/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/news/module.xml
lenya/trunk/src/modules/notification/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/notification/module.xml
lenya/trunk/src/modules/opendocument/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/opendocument/module.xml
lenya/trunk/src/modules/profiling/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/profiling/module.xml
lenya/trunk/src/modules/resource/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/resource/module.xml
lenya/trunk/src/modules/simplesite/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/simplesite/module.xml
lenya/trunk/src/modules/sitetree/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/sitetree/module.xml
lenya/trunk/src/modules/sourcerepository/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/sourcerepository/module.xml
lenya/trunk/src/modules/svg/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/svg/module.xml
lenya/trunk/src/modules/tinymce/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/tinymce/module.xml
lenya/trunk/src/modules/usecasedocument/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/usecasedocument/module.xml
lenya/trunk/src/modules/webdav/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/webdav/module.xml
lenya/trunk/src/modules/xhtml/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/xhtml/module.xml
lenya/trunk/src/modules/xopus/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/modules/xopus/module.xml
lenya/trunk/src/pubs/default/modules/defaultusecases/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/pubs/default/modules/defaultusecases/module.xml
lenya/trunk/src/pubs/default/modules/homepage/config/module.xml
- copied unchanged from r531356, lenya/trunk/src/pubs/default/modules/homepage/module.xml
Removed:
lenya/trunk/src/modules-core/ac/module.xml
lenya/trunk/src/modules-core/acusecases/module.xml
lenya/trunk/src/modules-core/administration/module.xml
lenya/trunk/src/modules-core/cache/module.xml
lenya/trunk/src/modules-core/janitor/module.xml
lenya/trunk/src/modules-core/ldap/module.xml
lenya/trunk/src/modules-core/linking/module.xml
lenya/trunk/src/modules-core/observation/module.xml
lenya/trunk/src/modules-core/properties/module.xml
lenya/trunk/src/modules-core/sitemanagement/module.xml
lenya/trunk/src/modules-core/templating/module.xml
lenya/trunk/src/modules-core/usecase/module.xml
lenya/trunk/src/modules-core/workflow/module.xml
lenya/trunk/src/modules-legacy/task/module.xml
lenya/trunk/src/modules-optional/jcrsource/module.xml
lenya/trunk/src/modules/blog/module.xml
lenya/trunk/src/modules/bxe/module.xml
lenya/trunk/src/modules/cforms/module.xml
lenya/trunk/src/modules/collection/module.xml
lenya/trunk/src/modules/contactform/module.xml
lenya/trunk/src/modules/development/module.xml
lenya/trunk/src/modules/editors/module.xml
lenya/trunk/src/modules/export/module.xml
lenya/trunk/src/modules/fckeditor/module.xml
lenya/trunk/src/modules/kupu/module.xml
lenya/trunk/src/modules/languageselector/module.xml
lenya/trunk/src/modules/lenyadoc/module.xml
lenya/trunk/src/modules/linkcheck/module.xml
lenya/trunk/src/modules/links/module.xml
lenya/trunk/src/modules/lucene/module.xml
lenya/trunk/src/modules/migration/module.xml
lenya/trunk/src/modules/neutron/module.xml
lenya/trunk/src/modules/news/module.xml
lenya/trunk/src/modules/notification/module.xml
lenya/trunk/src/modules/opendocument/module.xml
lenya/trunk/src/modules/profiling/module.xml
lenya/trunk/src/modules/resource/module.xml
lenya/trunk/src/modules/simplesite/module.xml
lenya/trunk/src/modules/sitetree/module.xml
lenya/trunk/src/modules/sourcerepository/module.xml
lenya/trunk/src/modules/svg/module.xml
lenya/trunk/src/modules/tinymce/module.xml
lenya/trunk/src/modules/usecasedocument/module.xml
lenya/trunk/src/modules/webdav/module.xml
lenya/trunk/src/modules/xhtml/module.xml
lenya/trunk/src/modules/xopus/module.xml
lenya/trunk/src/pubs/default/modules/defaultusecases/module.xml
lenya/trunk/src/pubs/default/modules/homepage/module.xml
Modified:
lenya/trunk/src/resources/build/modules2build.xsl
Modified: lenya/trunk/src/resources/build/modules2build.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/resources/build/modules2build.xsl?view=diff&rev=531457&r1=531456&r2=531457
==============================================================================
--- lenya/trunk/src/resources/build/modules2build.xsl (original)
+++ lenya/trunk/src/resources/build/modules2build.xsl Mon Apr 23 06:07:01 2007
@@ -30,6 +30,8 @@
<xsl:param name="module-schema"/>
<xsl:param name="copy-modules"/>
+ <xsl:variable name="configFile">/config/module.xml</xsl:variable>
+
<xsl:template name="separator">
<xsl:if test="following-sibling::list:module">
@@ -62,7 +64,7 @@
<xsl:variable name="compileDependencyList">
<xsl:for-each select="list:module">
- <xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="call"/>
+ <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="call"/>
<xsl:call-template name="separator"/>
</xsl:for-each>
</xsl:variable>
@@ -70,7 +72,7 @@
<xsl:variable name="testDependencyList">
<xsl:for-each select="list:module">
- <xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="patch-test"/>
+ <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="patch-test"/>
<xsl:call-template name="separator"/>
</xsl:for-each>
</xsl:variable>
@@ -87,7 +89,7 @@
<xsl:variable name="canooDependencyList">
<xsl:for-each select="list:module">
- <xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="test-canoo"/>
+ <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="test-canoo"/>
<xsl:call-template name="separator"/>
</xsl:for-each>
</xsl:variable>
@@ -111,7 +113,7 @@
<xsl:template match="list:module" mode="call-test">
- <xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="call-test"/>
+ <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="call-test"/>
</xsl:template>
<xsl:template match="mod:module" mode="call-test">
@@ -120,7 +122,7 @@
<xsl:template match="list:module" mode="call-test-canoo">
- <xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="call-test-canoo"/>
+ <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="call-test-canoo"/>
</xsl:template>
<xsl:template match="mod:module" mode="call-test-canoo">
@@ -134,7 +136,7 @@
<xsl:template match="list:module" mode="call-javadocs">
- <xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="call-javadocs"/>
+ <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="call-javadocs"/>
</xsl:template>
<xsl:template match="mod:module" mode="call-javadocs">
@@ -143,7 +145,7 @@
<xsl:template match="list:module" mode="target">
- <xsl:apply-templates select="document(concat(@src, '/module.xml'))/mod:module" mode="target">
+ <xsl:apply-templates select="document(concat(@src, $configFile))/mod:module" mode="target">
<xsl:with-param name="src" select="@src"/>
</xsl:apply-templates>
</xsl:template>
@@ -155,7 +157,7 @@
<xsl:variable name="shortname" select="substring(mod:id, string-length(mod:package) + 2)"/>
<target name="validate-module-{$id}">
- <jing rngfile="{$module-schema}" file="{$src}/module.xml"/>
+ <jing rngfile="{$module-schema}" file="{$src}{$configFile}"/>
</target>
<xsl:text>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org
Re: svn commit: r531457 - in /lenya/trunk/src: modules-core/ac/ modules-core/ac/config/
modules-core/acusecases/ modules-core/acusecases/config/ modules-core/administration/
modules-core/administration/config/ modules-core/cache/ modules-core/cache/config/...
Posted by Andreas Hartmann <an...@apache.org>.
Joern Nettingsmeier schrieb:
> i guess you just convinced me about the necessity of config/ directories :)
>
> would you be so kind as to add a note to the global readme.xml that
> people will have to tweak their custom modules a little?
Done, thanks for the hint!
-- Andreas
>
>
> andreas@apache.org wrote:
>> Author: andreas
>> Date: Mon Apr 23 06:07:01 2007
>> New Revision: 531457
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=531457
>> Log:
>> Moved <module>/module.xml to <module>/config/
>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn commit: r531457 - in /lenya/trunk/src: modules-core/ac/ modules-core/ac/config/
modules-core/acusecases/ modules-core/acusecases/config/ modules-core/administration/
modules-core/administration/config/ modules-core/cache/ modules-core/cache/config/...
Posted by Joern Nettingsmeier <ne...@folkwang-hochschule.de>.
i guess you just convinced me about the necessity of config/ directories :)
would you be so kind as to add a note to the global readme.xml that
people will have to tweak their custom modules a little?
andreas@apache.org wrote:
> Author: andreas
> Date: Mon Apr 23 06:07:01 2007
> New Revision: 531457
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=531457
> Log:
> Moved <module>/module.xml to <module>/config/
>
--
jörn nettingsmeier
home://germany/45128 essen/lortzingstr. 11/
http://spunk.dnsalias.org
phone://+49/201/491621
Kurt is up in Heaven now.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org