cziegeler 2002/06/03 06:13:55
Modified: . build.xml
src/java/org/apache/cocoon/webapps/authentication
authentication.xconf
src/java/org/apache/cocoon/webapps/portal portal.xconf
src/java/org/apache/cocoon/webapps/session session.xconf
Added: src/java/org/apache/cocoon/webapps/authentication
authentication.xroles
src/java/org/apache/cocoon/webapps/portal portal.xroles
src/java/org/apache/cocoon/webapps/session session.xroles
Log:
Added possibility to add new roles to the cocoon.roles file
Revision Changes Path
1.224 +9 -0 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- build.xml 3 Jun 2002 09:14:01 -0000 1.223
+++ build.xml 3 Jun 2002 13:13:55 -0000 1.224
@@ -905,6 +905,15 @@
</fileset>
</copy>
+ <!-- A task to change the roles file. It is used to add optional components -->
+ <taskdef name="roles-tool" classname="XConfToolTask"
+ classpath="${tools.dir}/anttasks"/>
+
+ <!-- Invoke the XConfTool to add optional roles for components -->
+ <roles-tool directory="${build.src}"
+ extension="xroles"
+ configuration="${build.dest}/org/apache/cocoon/cocoon.roles"/>
+
<echo message="Compiling with Java ${ant.java.version}, debug ${debug},
optimize ${optimize}, deprecation ${deprecation}"/>
<javac srcdir="${build.src}"
1.3 +8 -8
xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/authentication.xconf
Index: authentication.xconf
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/authentication.xconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- authentication.xconf 17 Apr 2002 13:14:43 -0000 1.2
+++ authentication.xconf 3 Jun 2002 13:13:55 -0000 1.3
@@ -2,12 +2,12 @@
<xconf xpath="/cocoon" unless="component[mediatypes/media]">
- <component
role="org.apache.cocoon.webapps.authentication.components.AuthenticationManager"
-
class="org.apache.cocoon.webapps.authentication.components.AuthenticationManager">
- <mediatypes default="html">
- <media name="wap" useragent="Nokia"/>
- <media name="wap" useragent="UP"/>
- <media name="wap" useragent="Wapalizer"/>
- </mediatypes>
- </component>
+ <authentication-manager logger="core.authentication-manager"
+ pool-max="32" pool-min="8" pool-grow="4">
+ <mediatypes default="html">
+ <media name="wap" useragent="Nokia"/>
+ <media name="wap" useragent="UP"/>
+ <media name="wap" useragent="Wapalizer"/>
+ </mediatypes>
+ </authentication-manager>
</xconf>
1.1
xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/authentication.xroles
Index: authentication.xroles
===================================================================
<?xml version="1.0"?>
<xroles xpath="/role-list"
unless="role[@name='org.apache.cocoon.webapps.authentication.components.AuthenticationManager']">
<role
name="org.apache.cocoon.webapps.authentication.components.AuthenticationManager"
shorthand="authentication-manager"
default-class="org.apache.cocoon.webapps.authentication.components.AuthenticationManager"/>
</xroles>
1.4 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/portal.xconf
Index: portal.xconf
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/portal.xconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- portal.xconf 18 Apr 2002 15:21:29 -0000 1.3
+++ portal.xconf 3 Jun 2002 13:13:55 -0000 1.4
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
-<xconf xpath="/cocoon" unless="component[@role =
'org.apache.cocoon.webapps.portal.components.PortalManager']">
+<xconf xpath="/cocoon" unless="portal-manager">
+
+ <portal-manager logger="core.portal-manager"
+ pool-max="32" pool-min="8" pool-grow="4"/>
- <component role="org.apache.cocoon.webapps.portal.components.PortalManager"
- class="org.apache.cocoon.webapps.portal.components.PortalManager"/>
</xconf>
1.1
xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/portal.xroles
Index: portal.xroles
===================================================================
<?xml version="1.0"?>
<xroles xpath="/role-list"
unless="role[@name='org.apache.cocoon.webapps.portal.components.PortalManager']">
<role name="org.apache.cocoon.webapps.portal.components.PortalManager"
shorthand="portal-manager"
default-class="org.apache.cocoon.webapps.portal.components.PortalManager"/>
</xroles>
1.4 +4 -8
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/session.xconf
Index: session.xconf
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/session.xconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- session.xconf 8 May 2002 05:44:02 -0000 1.3
+++ session.xconf 3 Jun 2002 13:13:55 -0000 1.4
@@ -1,12 +1,8 @@
<?xml version="1.0"?>
-<xconf xpath="/cocoon"
unless="component[@role='org.apache.cocoon.webapps.session.components.SessionManager']">
+<xconf xpath="/cocoon" unless="session-manager">
+
+ <session-manager logger="core.session-manager"
+ pool-max="32" pool-min="8" pool-grow="4"/>
- <component role="org.apache.cocoon.webapps.session.components.SessionManager"
- class="org.apache.cocoon.webapps.session.components.SessionManager"
- logger="core.session-manager"
- pool-max="32" pool-min="8" pool-grow="4"/>
- <component role="org.apache.cocoon.webapps.session.connector.ResourceConnector"
-
class="org.apache.cocoon.webapps.session.connector.ResourceConnectorImpl"
- logger="core.resource-connector"/>
</xconf>
1.1
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/session.xroles
Index: session.xroles
===================================================================
<?xml version="1.0"?>
<xroles xpath="/role-list" unless="role
[@name='org.apache.cocoon.webapps.session.components.SessionManager']">
<role name="org.apache.cocoon.webapps.session.components.SessionManager"
shorthand="session-manager"
default-class="org.apache.cocoon.webapps.session.components.SessionManager"/>
<role name="org.apache.cocoon.webapps.session.connector.ResourceConnector"
shorthand="resource-connector"
default-class="org.apache.cocoon.webapps.session.connector.ResourceConnectorImpl"/>
</xroles>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
