March 2008 - seam-commits - Jboss List Archives

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2008-03-27 10:50:42 -0400 (Thu, 27 Mar 2008) New Revision: 7721 Added: tags/JBPAPP_4_2_CP_0803/ Log: Copied: tags/JBPAPP_4_2_CP_0803 (from rev 7720, branches/Seam_1_2_1_AP)

16 years, 8 months

1
0
0 / 0

Seam SVN: r7720 - in branches/Seam_1_2_1_AP: drools/lib and 18 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2008-03-27 07:56:20 -0400 (Thu, 27 Mar 2008) New Revision: 7720 Added: branches/Seam_1_2_1_AP/drools/lib/antlr-2.7.6.jar branches/Seam_1_2_1_AP/drools/lib/antlr-3.0ea8.jar branches/Seam_1_2_1_AP/drools/lib/commons-jci-core-1.0-406301.jar branches/Seam_1_2_1_AP/drools/lib/commons-jci-janino-2.4.3.jar branches/Seam_1_2_1_AP/drools/lib/commons-lang-2.1.jar branches/Seam_1_2_1_AP/drools/lib/commons-logging-api-1.0.4.jar branches/Seam_1_2_1_AP/drools/lib/drools-compiler-3.0.5.jar branches/Seam_1_2_1_AP/drools/lib/drools-core-3.0.5.jar branches/Seam_1_2_1_AP/drools/lib/janino-2.4.3.jar branches/Seam_1_2_1_AP/drools/lib/stringtemplate-2.3b6.jar branches/Seam_1_2_1_AP/lib/jbpm-3.1.4.jar Removed: branches/Seam_1_2_1_AP/drools/lib/antlr-runtime-3.0.jar branches/Seam_1_2_1_AP/drools/lib/drools-compiler-4.0.2.jar branches/Seam_1_2_1_AP/drools/lib/drools-core-4.0.2.jar branches/Seam_1_2_1_AP/drools/lib/janino-2.5.10.jar branches/Seam_1_2_1_AP/drools/lib/mvel-1.2.22-java1.4.jar branches/Seam_1_2_1_AP/drools/lib/xpp3_min-1.1.3.4.O.jar branches/Seam_1_2_1_AP/drools/lib/xstream-1.2.2.jar branches/Seam_1_2_1_AP/lib/jbpm-identity.jar branches/Seam_1_2_1_AP/lib/jbpm-jpdl.jar Modified: branches/Seam_1_2_1_AP/.classpath branches/Seam_1_2_1_AP/build.properties branches/Seam_1_2_1_AP/examples/drools/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/dvdstore/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/dvdstore/resources/hibernate.cfg.xml branches/Seam_1_2_1_AP/examples/dvdstore/resources/jbpm.cfg.xml branches/Seam_1_2_1_AP/examples/numberguess/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/seamspace/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/takeaway/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/takeaway/resources/hibernate.cfg.xml branches/Seam_1_2_1_AP/examples/todo/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/todo/resources/hibernate.cfg.xml branches/Seam_1_2_1_AP/examples/todo/resources/jbpm.cfg.xml branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml branches/Seam_1_2_1_AP/examples/wiki/build.properties branches/Seam_1_2_1_AP/lib/readme.txt branches/Seam_1_2_1_AP/seam-gen/build-scripts/.classpath branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml branches/Seam_1_2_1_AP/seam-gen/resources/META-INF/application.xml branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/DroolsHandler.java branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/RuleBase.java branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/RuleBasedIdentity.java Log: Rollback the upgrade of drools/jbpm libraries Modified: branches/Seam_1_2_1_AP/.classpath =================================================================== --- branches/Seam_1_2_1_AP/.classpath 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/.classpath 2008-03-27 11:56:20 UTC (rev 7720) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main"/> + <classpathentry kind="src" path="examples/itext/src"/> <classpathentry kind="src" path="src/remoting"/> <classpathentry kind="src" path="src/ioc"/> <classpathentry kind="src" path="src/mail"/> @@ -22,20 +23,23 @@ <classpathentry kind="lib" path="lib/jboss-cache-jdk50.jar"/> <classpathentry kind="lib" path="lib/el-api.jar"/> <classpathentry kind="lib" path="lib/el-ri.jar"/> - <classpathentry kind="lib" path="lib/myfaces-api-1.1.4.jar"/> - <classpathentry kind="lib" path="lib/myfaces-impl-1.1.4.jar"/> + <classpathentry kind="lib" path="lib/jsf-api.jar"/> + <classpathentry kind="lib" path="lib/jsf-impl.jar"/> <classpathentry kind="lib" path="lib/ant.jar"/> <classpathentry kind="lib" path="embedded-ejb/conf"/> + <classpathentry kind="lib" path="drools/lib/drools-compiler-3.0.5.jar"/> + <classpathentry kind="lib" path="drools/lib/drools-core-3.0.5.jar"/> <classpathentry kind="lib" path="lib/jsf-facelets.jar"/> <classpathentry kind="lib" path="lib/mail.jar"/> + <classpathentry kind="lib" path="lib/jbpm-3.1.4.jar"/> <classpathentry kind="lib" path="lib/activation.jar"/> <classpathentry kind="lib" path="lib/mail-ra.jar"/> <classpathentry kind="lib" path="lib/spring.jar"/> <classpathentry kind="lib" path="lib/itext-2.0.1.jar"/> <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/> <classpathentry kind="lib" path="lib/jcaptcha-all-1.0-RC4.jar"/> - <classpathentry kind="lib" path="lib/jbpm-jpdl.jar"/> - <classpathentry kind="lib" path="drools/lib/drools-compiler-4.0.2.jar"/> - <classpathentry kind="lib" path="drools/lib/drools-core-4.0.2.jar"/> + <classpathentry kind="lib" path="lib/jsp-api.jar"/> + <classpathentry kind="lib" path="examples/itext/lib/jfreechart.jar"/> + <classpathentry kind="lib" path="drools/lib/janino-2.4.3.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath> Modified: branches/Seam_1_2_1_AP/build.properties =================================================================== --- branches/Seam_1_2_1_AP/build.properties 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/build.properties 2008-03-27 11:56:20 UTC (rev 7720) @@ -1,2 +1,2 @@ -tomcat.home=C:/Java/apache-tomcat-6.0.10 -jboss.home=G:/jboss-4.2.2.GA +tomcat.home= /home/mnovotny/apps/apache-tomcat-6.0.16 +jboss.home= /home/mnovotny/apps/jboss-4.2.2.GA Added: branches/Seam_1_2_1_AP/drools/lib/antlr-2.7.6.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/antlr-2.7.6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_1_2_1_AP/drools/lib/antlr-3.0ea8.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/antlr-3.0ea8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/drools/lib/antlr-runtime-3.0.jar =================================================================== (Binary files differ) Added: branches/Seam_1_2_1_AP/drools/lib/commons-jci-core-1.0-406301.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/commons-jci-core-1.0-406301.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_1_2_1_AP/drools/lib/commons-jci-janino-2.4.3.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/commons-jci-janino-2.4.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_1_2_1_AP/drools/lib/commons-lang-2.1.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/commons-lang-2.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_1_2_1_AP/drools/lib/commons-logging-api-1.0.4.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/commons-logging-api-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_1_2_1_AP/drools/lib/drools-compiler-3.0.5.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/drools-compiler-3.0.5.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/drools/lib/drools-compiler-4.0.2.jar =================================================================== (Binary files differ) Added: branches/Seam_1_2_1_AP/drools/lib/drools-core-3.0.5.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/drools-core-3.0.5.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/drools/lib/drools-core-4.0.2.jar =================================================================== (Binary files differ) Added: branches/Seam_1_2_1_AP/drools/lib/janino-2.4.3.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/janino-2.4.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/drools/lib/janino-2.5.10.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/drools/lib/mvel-1.2.22-java1.4.jar =================================================================== (Binary files differ) Added: branches/Seam_1_2_1_AP/drools/lib/stringtemplate-2.3b6.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/stringtemplate-2.3b6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/drools/lib/xpp3_min-1.1.3.4.O.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/drools/lib/xstream-1.2.2.jar =================================================================== (Binary files differ) Modified: branches/Seam_1_2_1_AP/examples/drools/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/drools/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/drools/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -26,23 +26,35 @@ </module> <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module> <module> - <java>drools-compiler-4.0.2.jar</java> + <java>drools-compiler-3.0.5.jar</java> </module> <module> - <java>drools-core-4.0.2.jar</java> + <java>drools-core-3.0.5.jar</java> </module> <module> - <java>antlr-runtime-3.0.jar</java> + <java>antlr-2.7.6.jar</java> </module> <module> - <java>janino-2.5.10.jar</java> + <java>antlr-3.0ea8.jar</java> </module> <module> - <java>mvel-1.2.22-java1.4.jar</java> + <java>commons-jci-core-1.0-406301.jar</java> </module> + <module> + <java>commons-jci-janino-2.4.3.jar</java> + </module> + <module> + <java>commons-lang-2.1.jar</java> + </module> + <module> + <java>janino-2.4.3.jar</java> + </module> + <module> + <java>stringtemplate-2.3b6.jar</java> + </module> </application> \ No newline at end of file Modified: branches/Seam_1_2_1_AP/examples/dvdstore/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/dvdstore/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/dvdstore/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -22,6 +22,6 @@ <java>el-ri.jar</java> </module> <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module> </application> Modified: branches/Seam_1_2_1_AP/examples/dvdstore/resources/hibernate.cfg.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/dvdstore/resources/hibernate.cfg.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/dvdstore/resources/hibernate.cfg.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -24,36 +24,29 @@    +   -  +   -  -  -  -  +  +  + +  - -  -  -  + --> -     <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> - -  - <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>  <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> @@ -72,7 +65,6 @@ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> @@ -121,11 +113,13 @@ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> -  - <mapping resource="org/jbpm/job/Job.hbm.xml"/> - <mapping resource="org/jbpm/job/Timer.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> +  + <mapping resource="org/jbpm/msg/Message.hbm.xml"/> + <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/>  <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> @@ -133,6 +127,9 @@ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> +  + <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/> +  <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> @@ -141,7 +138,6 @@ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> Modified: branches/Seam_1_2_1_AP/examples/dvdstore/resources/jbpm.cfg.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/dvdstore/resources/jbpm.cfg.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/dvdstore/resources/jbpm.cfg.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -10,7 +10,6 @@ </service> <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" /> <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" /> - <service name="tx" factory="org.jbpm.tx.TxServiceFactory" /> <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" /> <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" /> </jbpm-context> Modified: branches/Seam_1_2_1_AP/examples/numberguess/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/numberguess/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/numberguess/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -19,7 +19,7 @@ <java>jboss-seam.jar</java> </module> <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module> <module> <java>el-ri.jar</java> Modified: branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -20,32 +20,44 @@ <module> <java>jboss-seam.jar</java> </module> + + <module> + <java>drools-compiler-3.0.5.jar</java> + </module> + + <module> + <java>drools-core-3.0.5.jar</java> + </module> -  - - <module> - <java>drools-compiler-4.0.2.jar</java> - </module> - <module> - <java>drools-core-4.0.2.jar</java> - </module> - <module> - <java>antlr-runtime-3.0.jar</java> - </module> - <module> - <java>janino-2.5.10.jar</java> - </module> - <module> - <java>mvel-1.2.22-java1.4.jar</java> - </module> + <java>janino-2.4.3.jar</java> + </module> + + <module> + <java>stringtemplate-2.3b6.jar</java> + </module> <module> + <java>antlr-2.7.6.jar</java> + </module> + + <module> + <java>antlr-3.0ea8.jar</java> + </module> + + <module> <java>jcaptcha-all-1.0-RC4.jar</java> </module> Modified: branches/Seam_1_2_1_AP/examples/seamspace/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/seamspace/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/seamspace/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -26,23 +26,43 @@ <java>el-ri.jar</java> </module> - <module> - <java>drools-compiler-4.0.2.jar</java> - </module> - <module> - <java>drools-core-4.0.2.jar</java> - </module> - <module> - <java>antlr-runtime-3.0.jar</java> - </module> - <module> - <java>janino-2.5.10.jar</java> - </module> - <module> - <java>mvel-1.2.22-java1.4.jar</java> - </module> + <module> + <java>drools-compiler-3.0.5.jar</java> + </module> + + <module> + <java>drools-core-3.0.5.jar</java> + </module> <module> + <java>commons-jci-core-1.0-406301.jar</java> + </module> + + <module> + <java>commons-jci-janino-2.4.3.jar</java> + </module> + + <module> + <java>commons-lang-2.1.jar</java> + </module> + + <module> + <java>janino-2.4.3.jar</java> + </module> + + <module> + <java>stringtemplate-2.3b6.jar</java> + </module> + + <module> + <java>antlr-2.7.6.jar</java> + </module> + + <module> + <java>antlr-3.0ea8.jar</java> + </module> + + <module> <java>jcaptcha-all-1.0-RC4.jar</java> </module> Modified: branches/Seam_1_2_1_AP/examples/takeaway/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/takeaway/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/takeaway/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -19,13 +19,13 @@ <java>jboss-seam.jar</java> </module>  - <module> +  <module> <java>el-ri.jar</java> </module> <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module> </application> Modified: branches/Seam_1_2_1_AP/examples/takeaway/resources/hibernate.cfg.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/takeaway/resources/hibernate.cfg.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/takeaway/resources/hibernate.cfg.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -24,36 +24,29 @@    +   -  +   -  -  -  -  +  +  + +  - -  -  -  + --> -     <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> - -  - <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>  <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> @@ -72,7 +65,6 @@ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> @@ -121,11 +113,13 @@ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> -  - <mapping resource="org/jbpm/job/Job.hbm.xml"/> - <mapping resource="org/jbpm/job/Timer.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> +  + <mapping resource="org/jbpm/msg/Message.hbm.xml"/> + <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/>  <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> @@ -133,6 +127,9 @@ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> +  + <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/> +  <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> @@ -141,7 +138,6 @@ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> Modified: branches/Seam_1_2_1_AP/examples/todo/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/todo/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/todo/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -19,7 +19,7 @@ <java>jboss-seam.jar</java> </module> <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module> <module> <java>el-ri.jar</java> Modified: branches/Seam_1_2_1_AP/examples/todo/resources/hibernate.cfg.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/todo/resources/hibernate.cfg.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/todo/resources/hibernate.cfg.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -13,7 +13,7 @@ <property name="transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> <property name="hbm2ddl.auto">create-drop</property> -  +    @@ -24,36 +24,29 @@    +   -  +   -  -  -  -  +  +  + +  - -  -  -  + --> -     <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> - -  - <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>  <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> @@ -72,7 +65,6 @@ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> @@ -121,11 +113,13 @@ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> -  - <mapping resource="org/jbpm/job/Job.hbm.xml"/> - <mapping resource="org/jbpm/job/Timer.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> +  + <mapping resource="org/jbpm/msg/Message.hbm.xml"/> + <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/>  <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> @@ -133,6 +127,9 @@ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> +  + <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/> +  <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> @@ -141,7 +138,6 @@ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> Modified: branches/Seam_1_2_1_AP/examples/todo/resources/jbpm.cfg.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/todo/resources/jbpm.cfg.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/todo/resources/jbpm.cfg.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -8,7 +8,6 @@ </bean> </factory> </service> - <service name="tx" factory="org.jbpm.tx.TxServiceFactory" /> <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" /> <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" /> <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" /> Modified: branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml =================================================================== --- branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml 2008-03-27 11:56:20 UTC (rev 7720) @@ -108,9 +108,9 @@ <library> <CLASSES> <root url="jar://$MODULE_DIR$/../../lib/jsf-impl.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> + </CLASSES> + <JAVADOC /> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> @@ -125,7 +125,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../lib/jcaptcha-all-1.0-RC3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../lib/jcaptcha-all-1.0-RC4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -278,7 +278,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../lib/jbpm-jpdl.jar!/" /> + <root url="jar://$MODULE_DIR$/../../lib/jbpm-3.1.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -386,7 +386,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../drools/lib/drools-compiler-4.0.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../drools/lib/drools-compiler-3.0.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -395,7 +395,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../drools/lib/janino-2.5.10.jar!/" /> + <root url="jar://$MODULE_DIR$/../../drools/lib/commons-jci-core-1.0-406301.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -404,7 +404,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../drools/lib/mvel-1.2.22-java1.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../drools/lib/janino-2.4.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -413,7 +413,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../drools/lib/antlr-runtime-3.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../drools/lib/commons-logging-api-1.0.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -422,7 +422,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../drools/lib/drools-core-4.0.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../drools/lib/commons-lang-2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -431,6 +431,51 @@ <orderEntry type="module-library"> <library> <CLASSES> + <root url="jar://$MODULE_DIR$/../../drools/lib/commons-jci-janino-2.4.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../drools/lib/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../drools/lib/stringtemplate-2.3b6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../drools/lib/antlr-3.0ea8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../drools/lib/drools-core-3.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> <root url="jar://$MODULE_DIR$/../../lib/testng-5.5-jdk15.jar!/" /> </CLASSES> <JAVADOC /> @@ -483,30 +528,55 @@ <component name="WebModuleProperties"> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/antlr-runtime-3.0.jar" /> - <url>jar://$MODULE_DIR$/../../drools/lib/antlr-runtime-3.0.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/antlr-2.7.6.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/antlr-2.7.6.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/mvel-1.2.22-java1.4.jar" /> - <url>jar://$MODULE_DIR$/../../drools/lib/mvel-1.2.22-java1.4.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/antlr-3.0ea8.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/antlr-3.0ea8.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/drools-compiler-4.0.2.jar" /> - <url>jar://$MODULE_DIR$/../../drools/lib/drools-compiler-4.0.2.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/commons-jci-core-1.0-406301.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/commons-jci-core-1.0-406301.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/drools-core-4.0.2.jar" /> - <url>jar://$MODULE_DIR$/../../drools/lib/drools-core-4.0.2.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/commons-jci-janino-2.4.3.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/commons-jci-janino-2.4.3.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/janino-2.5.10.jar" /> - <url>jar://$MODULE_DIR$/../../drools/lib/janino-2.5.10.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/commons-lang-2.1.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/commons-lang-2.1.jar!/</url> </containerElement> <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/commons-logging-api-1.0.4.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/commons-logging-api-1.0.4.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/drools-compiler-3.0.5.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/drools-compiler-3.0.5.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/drools-core-3.0.5.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/drools-core-3.0.5.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/janino-2.4.3.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/janino-2.4.3.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/stringtemplate-2.3b6.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/stringtemplate-2.3b6.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib/urlrewrite-3.0.3.jar" /> <url>jar://$MODULE_DIR$/src/etc/WEB-INF/lib/urlrewrite-3.0.3.jar!/</url> @@ -653,8 +723,8 @@ </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/jbpm-jpdl.jar" /> - <url>jar://$MODULE_DIR$/../../lib/jbpm-jpdl.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/jbpm-3.1.4.jar" /> + <url>jar://$MODULE_DIR$/../../lib/jbpm-3.1.4.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> @@ -686,12 +756,11 @@ <attribute name="URI" value="/WEB-INF/lib/mail.jar" /> <url>jar://$MODULE_DIR$/../../lib/mail.jar!/</url> </containerElement> - <containerElement type="library" level="module"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/myfaces-api-1.1.4.jar" /> - <url>jar://$MODULE_DIR$/../../lib/myfaces-api-1.1.4.jar!/</url> + <containerElement type="library" level="module"> + <attribute name="URI" value="/WEB-INF/lib/jsf-impl.jar" /> + <url>jar://$MODULE_DIR$/../../lib/jsf-impl.jar!/</url> </containerElement> - <containerElement type="library" level="module"> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/jsf-impl.jar" /> <url>jar://$MODULE_DIR$/../../lib/jsf-impl.jar!/</url> Modified: branches/Seam_1_2_1_AP/examples/wiki/build.properties =================================================================== --- branches/Seam_1_2_1_AP/examples/wiki/build.properties 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/wiki/build.properties 2008-03-27 11:56:20 UTC (rev 7720) @@ -1,4 +1,4 @@ -jboss.home = /Users/turin/work/local/jboss/jboss-4.0.5.GA +jboss.home= /home/mnovotny/apps/jboss-4.2.2.GA # That stuff doesn't really work for me, PAGE scoped components can't be hot-deployed (CNFE on deserialization of component state) #hotdeploy.classes = **/wiki/core/action/** **/wiki/core/dao/** **/wiki/core/links/** **/wiki/plugin/lastmodified/** **/wiki/plugin/blogdirectory/BlogDirectory* javac.debug = true Added: branches/Seam_1_2_1_AP/lib/jbpm-3.1.4.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/lib/jbpm-3.1.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/lib/jbpm-identity.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/lib/jbpm-jpdl.jar =================================================================== (Binary files differ) Modified: branches/Seam_1_2_1_AP/lib/readme.txt =================================================================== --- branches/Seam_1_2_1_AP/lib/readme.txt 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/lib/readme.txt 2008-03-27 11:56:20 UTC (rev 7720) @@ -4,7 +4,7 @@ The only jars required to run Seam in a full Java EE 5 environment are: - jbpm-jpdl.jar + jbpm-3.1.4.jar thirdparty-all.jar To use Seam with Hibernate3 in a J2EE 1.4 environment, Modified: branches/Seam_1_2_1_AP/seam-gen/build-scripts/.classpath =================================================================== --- branches/Seam_1_2_1_AP/seam-gen/build-scripts/.classpath 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/seam-gen/build-scripts/.classpath 2008-03-27 11:56:20 UTC (rev 7720) @@ -12,12 +12,15 @@ <classpathentry kind="lib" path="lib/jboss-ejb3-all.jar"/> <classpathentry kind="lib" path="lib/jboss-seam.jar"/> <classpathentry kind="lib" path="lib/jboss-seam-debug.jar"/> - <classpathentry kind="lib" path="lib/jbpm-jpdl.jar"/> - <classpathentry kind="lib" path="lib/drools-core-4.0.2.jar"/> - <classpathentry kind="lib" path="lib/drools-compiler-4.0.2.jar"/> - <classpathentry kind="lib" path="lib/drools/janino-2.5.10.jar"/> - <classpathentry kind="lib" path="lib/drools/antlr-runtime-3.0.jar"/> + <classpathentry kind="lib" path="lib/jbpm-3.1.4.jar"/> + <classpathentry kind="lib" path="lib/drools-core-3.0.5.jar"/> + <classpathentry kind="lib" path="lib/drools-compiler-3.0.5.jar"/> + <classpathentry kind="lib" path="lib/janino-2.4.3.jar"/> <classpathentry kind="lib" path="lib/antlr-2.7.6.jar"/> + <classpathentry kind="lib" path="lib/antlr-3.0ea8.jar"/> + <classpathentry kind="lib" path="lib/commons-jci-core-1.0-406301.jar"/> + <classpathentry kind="lib" path="lib/commons-jci-janino-2.4.3.jar"/> + <classpathentry kind="lib" path="lib/stringtemplate-2.3b6.jar"/> <classpathentry kind="lib" path="lib/jgroups.jar"/> <classpathentry kind="lib" path="lib/jsf-facelets.jar"/> <classpathentry kind="lib" path="lib/jstl-1.1.0.jar"/> Modified: branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml =================================================================== --- branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -80,7 +80,7 @@ <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"> <compilation-unit> <package-root>src</package-root> - <classpath mode="compile">lib/ant.jar:lib/commons-beanutils-1.7.0.jar:lib/commons-codec-1.3.jar:lib/commons-collections-3.1.jar:lib/commons-digester-1.6.jar:lib/commons-el-1.0.jar:lib/commons-lang-2.1.jar:lib/el-api.jar:lib/el-ri.jar:lib/hibernate-all.jar:lib/hsqldb.jar:lib/javax.servlet.jsp.jar:lib/jboss-aop-jdk50.jar:lib/jboss-cache-jdk50.jar:lib/jboss-ejb3-all.jar:lib/jboss-seam-debug.jar:lib/jboss-seam-ui.jar:lib/jboss-seam.jar:lib/jbpm-jpdl.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl-1.1.0.jar:lib/mailstuff.jar:lib/jsf-api.jar:lib/jsf-impl.jar:lib/portlet-api-lib.jar:lib/servlet-api.jar:lib/testng-4.5.1-jdk15.jar:lib/thirdparty-all.jar</classpath> + <classpath mode="compile">lib/ant.jar:lib/commons-beanutils-1.7.0.jar:lib/commons-codec-1.3.jar:lib/commons-collections-3.1.jar:lib/commons-digester-1.6.jar:lib/commons-el-1.0.jar:lib/commons-lang-2.1.jar:lib/el-api.jar:lib/el-ri.jar:lib/hibernate-all.jar:lib/hsqldb.jar:lib/javax.servlet.jsp.jar:lib/jboss-aop-jdk50.jar:lib/jboss-cache-jdk50.jar:lib/jboss-ejb3-all.jar:lib/jboss-seam-debug.jar:lib/jboss-seam-ui.jar:lib/jboss-seam.jar:lib/jbpm-3.1.4.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl-1.1.0.jar:lib/mailstuff.jar:lib/jsf-api.jar:lib/jsf-impl.jar:lib/portlet-api-lib.jar:lib/servlet-api.jar:lib/testng-4.5.1-jdk15.jar:lib/thirdparty-all.jar</classpath> <source-level>1.5</source-level> </compilation-unit> </java-data> Modified: branches/Seam_1_2_1_AP/seam-gen/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/seam-gen/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/seam-gen/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -27,24 +27,33 @@  <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module>  - <module> - <java>drools-compiler-4.0.2.jar</java> - </module> - <module> - <java>drools-core-4.0.2.jar</java> - </module> - <module> - <java>antlr-runtime-3.0.jar</java> - </module> - <module> - <java>janino-2.5.10.jar</java> - </module> - <module> - <java>mvel-1.2.22-java1.4.jar</java> - </module> + <module> + <java>drools-core-3.0.5.jar</java> + </module> + <module> + <java>drools-compiler-3.0.5.jar</java> + </module> + <module> + <java>janino-2.4.3.jar</java> + </module> + <module> + <java>antlr-2.7.6.jar</java> + </module> + <module> + <java>antlr-3.0ea8.jar</java> + </module> + <module> + <java>commons-jci-core-1.0-406301.jar</java> + </module> + <module> + <java>commons-jci-janino-2.4.3.jar</java> + </module> + <module> + <java>stringtemplate-2.3b6.jar</java> + </module> </application> Modified: branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml =================================================================== --- branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -112,7 +112,7 @@ <version>transient</version> <scope>system</scope> <systemPath> - ${seam.dir}/lib/jbpm-jpdl.jar + ${seam.dir}/lib/jbpm-3.1.4.jar </systemPath> </dependency> <dependency> Modified: branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/DroolsHandler.java =================================================================== --- branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/DroolsHandler.java 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/DroolsHandler.java 2008-03-27 11:56:20 UTC (rev 7720) @@ -26,6 +26,7 @@ for (String objectName: expressions) { + //TODO: delegate to jBPM instead of to JSF Object object = Expressions.instance().createValueBinding(objectName).getValue(); //Object object = new SeamVariableResolver().resolveVariable(objectName); // assert the object into the rules engine @@ -43,7 +44,7 @@ } //workingMemory.setGlobal( "contextInstance", executionContext.getContextInstance() ); - workingMemory.insert( Actor.instance() ); + workingMemory.assertObject( Actor.instance() ); return workingMemory; } @@ -53,11 +54,11 @@ FactHandle fact = workingMemory.getFactHandle(element); if (fact==null) { - workingMemory.insert(element); + workingMemory.assertObject(element); } else { - workingMemory.update(fact, element); + workingMemory.modifyObject(fact, element); } } } Modified: branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java =================================================================== --- branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java 2008-03-27 11:56:20 UTC (rev 7720) @@ -5,7 +5,7 @@ import java.io.Serializable; import org.drools.RuleBase; -import org.drools.StatefulSession; +import org.drools.WorkingMemory; import org.jboss.seam.Component; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Destroy; @@ -28,7 +28,7 @@ private static final long serialVersionUID = -1746942080571374743L; private String ruleBaseName; - private StatefulSession statefulSession; + private WorkingMemory workingMemory; private ValueBinding<RuleBase> ruleBase; public boolean clearDirty() { @@ -59,9 +59,9 @@ } @Unwrap - public StatefulSession getStatefulSession() + public WorkingMemory getWorkingMemory() { - if (statefulSession==null) + if (workingMemory==null) { RuleBase ruleBase; if (this.ruleBase!=null) @@ -82,15 +82,15 @@ { throw new IllegalStateException("RuleBase not found: " + ruleBaseName); } - statefulSession = ruleBase.newStatefulSession(); + workingMemory = ruleBase.newWorkingMemory(); } - return statefulSession; + return workingMemory; } @Destroy public void destroy() { - statefulSession.dispose(); + workingMemory.dispose(); } public ValueBinding<RuleBase> getRuleBase() { Modified: branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/RuleBase.java =================================================================== --- branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/RuleBase.java 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/RuleBase.java 2008-03-27 11:56:20 UTC (rev 7720) @@ -35,7 +35,8 @@ @Create public void compileRuleBase() throws Exception { - PackageBuilderConfiguration conf = new PackageBuilderConfiguration(); + PackageBuilderConfiguration conf = new PackageBuilderConfiguration(); + conf.setCompiler(PackageBuilderConfiguration.JANINO); PackageBuilder builder = new PackageBuilder(conf); if (ruleFiles!=null) Modified: branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/RuleBasedIdentity.java =================================================================== --- branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-03-27 11:56:20 UTC (rev 7720) @@ -9,13 +9,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Enumeration; -import java.util.Iterator; import java.util.List; import org.drools.FactHandle; import org.drools.RuleBase; -import org.drools.StatefulSession; -import org.drools.base.ClassObjectFilter; +import org.drools.WorkingMemory; import org.jboss.seam.Component; import org.jboss.seam.annotations.Install; import org.jboss.seam.annotations.Intercept; @@ -32,14 +30,11 @@ @Startup public class RuleBasedIdentity extends Identity { - - private static final long serialVersionUID = -2798083003251077858L; - public static final String RULES_COMPONENT_NAME = "securityRules"; private static final LogProvider log = Logging.getLogProvider(RuleBasedIdentity.class); - private StatefulSession securityContext; + private WorkingMemory securityContext; private RuleBase securityRules; @@ -59,7 +54,7 @@ if (securityRules != null) { - securityContext = securityRules.newStatefulSession(false); + securityContext = securityRules.newWorkingMemory(false); } if (securityContext == null) @@ -74,7 +69,7 @@ { super.postAuthenticate(); - StatefulSession securityContext = getSecurityContext(); + WorkingMemory securityContext = getSecurityContext(); if (securityContext != null) { @@ -87,12 +82,12 @@ while ( e.hasMoreElements() ) { Principal role = (Principal) e.nextElement(); - securityContext.insert( new Role( role.getName() ) ); + securityContext.assertObject( new Role( role.getName() ) ); } } } - securityContext.insert(getPrincipal()); + securityContext.assertObject(getPrincipal()); } } @@ -107,19 +102,17 @@ @Override public boolean hasPermission(String name, String action, Object...arg) { - StatefulSession securityContext = getSecurityContext(); + WorkingMemory securityContext = getSecurityContext(); if (securityContext == null) return false; - synchronizeContext(); - List<FactHandle> handles = new ArrayList<FactHandle>(); PermissionCheck check = new PermissionCheck(name, action); synchronized( securityContext ) { - handles.add( securityContext.insert(check) ); + handles.add( securityContext.assertObject(check) ); for (int i = 0; i < arg.length; i++) { @@ -129,57 +122,35 @@ { if ( securityContext.getFactHandle(value) == null ) { - handles.add( securityContext.insert(value) ); + handles.add( securityContext.assertObject(value) ); } } } else { - handles.add( securityContext.insert(arg[i]) ); + handles.add( securityContext.assertObject(arg[i]) ); } } securityContext.fireAllRules(); for (FactHandle handle : handles) - securityContext.retract(handle); + securityContext.retractObject(handle); } return check.isGranted(); } - /** - * Overridden version of hasRole() that checks for the existence of the role - * in the security context first. If it is not found there, then the super - * method is invoked instead. - */ @Override - public boolean hasRole(String role) - { - if (securityContext != null) - { - Iterator<Role> iter = securityContext.iterateObjects(new ClassObjectFilter(Role.class)); - - while (iter.hasNext()) - { - Role r = iter.next(); - if (r.getName().equals(role)) return true; - } - } - return super.hasRole(role); - } - - @Override protected void unAuthenticate() { - StatefulSession securityContext = getSecurityContext(); + WorkingMemory securityContext = getSecurityContext(); if (securityContext != null) { - Iterator<Role> iter = securityContext.iterateObjects(new ClassObjectFilter(Role.class)); - while (iter.hasNext()) + for (Role role : (List<Role>) securityContext.getObjects(Role.class)) { - getSecurityContext().retract(securityContext.getFactHandle(iter.next())); + getSecurityContext().retractObject(securityContext.getFactHandle(role)); } } @@ -191,8 +162,13 @@ { if (super.addRole(role)) { - synchronizeContext(); - return true; + WorkingMemory securityContext = getSecurityContext(); + + if (securityContext != null) + { + getSecurityContext().assertObject(new Role(role)); + return true; + } } return false; @@ -201,68 +177,31 @@ @Override public void removeRole(String role) { - super.removeRole(role); - synchronizeContext(); - } - - /** - * Synchronizes the state of the security context with that of the subject - */ - private void synchronizeContext() - { - if (getSecurityContext() != null) - { - - for ( Group sg : getSubject().getPrincipals(Group.class) ) - { - if ( ROLES_GROUP.equals( sg.getName() ) ) - { - Enumeration e = sg.members(); - while (e.hasMoreElements()) - { - Principal role = (Principal) e.nextElement(); + WorkingMemory securityContext = getSecurityContext(); - boolean found = false; - Iterator<Role> iter = getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); - while (iter.hasNext()) - { - Role r = iter.next(); - if (r.getName().equals(role.getName())) - { - found = true; - break; - } - } - - if (!found) - { - getSecurityContext().insert(new Role(role.getName())); - } - - } - } - } - } - - Iterator<Role> iter = getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); - while (iter.hasNext()) + if (securityContext != null) { - Role r = iter.next(); - if (!super.hasRole(r.getName())) + for (Role r : (List<Role>) getSecurityContext().getObjects(Role.class)) { - FactHandle fh = getSecurityContext().getFactHandle(r); - getSecurityContext().retract(fh); + if (r.getName().equals(role)) + { + FactHandle fh = getSecurityContext().getFactHandle(r); + getSecurityContext().retractObject(fh); + break; + } } } + + super.removeRole(role); } - - public StatefulSession getSecurityContext() + + public WorkingMemory getSecurityContext() { return securityContext; } - public void setSecurityContext(StatefulSession securityContext) + public void setSecurityContext(WorkingMemory securityContext) { this.securityContext = securityContext; } @@ -276,18 +215,5 @@ public void setSecurityRules(RuleBase securityRules) { this.securityRules = securityRules; - } - - @Override - public void logout() - { - // Explicitly destroy the security context - if (securityContext != null) - { - securityContext.dispose(); - securityContext = null; - } - - super.logout(); - } + } }

16 years, 8 months

1
0
0 / 0

Seam SVN: r7719 - trunk/src/main/org/jboss/seam/framework.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-27 07:00:32 -0400 (Thu, 27 Mar 2008) New Revision: 7719 Modified: trunk/src/main/org/jboss/seam/framework/EntityController.java trunk/src/main/org/jboss/seam/framework/EntityHome.java trunk/src/main/org/jboss/seam/framework/EntityQuery.java trunk/src/main/org/jboss/seam/framework/HibernateEntityController.java trunk/src/main/org/jboss/seam/framework/HibernateEntityHome.java trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java trunk/src/main/org/jboss/seam/framework/MutableEntityController.java trunk/src/main/org/jboss/seam/framework/PersistenceController.java Log: JBSEAM-2780 Modified: trunk/src/main/org/jboss/seam/framework/EntityController.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/EntityController.java 2008-03-27 10:37:16 UTC (rev 7718) +++ trunk/src/main/org/jboss/seam/framework/EntityController.java 2008-03-27 11:00:32 UTC (rev 7719) @@ -82,4 +82,10 @@ getEntityManager().remove(entity); } + @Override + protected boolean isPersistenceContextOpen(EntityManager persistenceContext) + { + return persistenceContext.isOpen(); + } + } Modified: trunk/src/main/org/jboss/seam/framework/EntityHome.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/EntityHome.java 2008-03-27 10:37:16 UTC (rev 7718) +++ trunk/src/main/org/jboss/seam/framework/EntityHome.java 2008-03-27 11:00:32 UTC (rev 7719) @@ -216,4 +216,10 @@ } } + @Override + protected boolean isPersistenceContextOpen(EntityManager persistenceContext) + { + return persistenceContext.isOpen(); + } + } Modified: trunk/src/main/org/jboss/seam/framework/EntityQuery.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/EntityQuery.java 2008-03-27 10:37:16 UTC (rev 7718) +++ trunk/src/main/org/jboss/seam/framework/EntityQuery.java 2008-03-27 11:00:32 UTC (rev 7719) @@ -235,4 +235,10 @@ } } + @Override + protected boolean isPersistenceContextOpen(EntityManager persistenceContext) + { + return persistenceContext.isOpen(); + } + } Modified: trunk/src/main/org/jboss/seam/framework/HibernateEntityController.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/HibernateEntityController.java 2008-03-27 10:37:16 UTC (rev 7718) +++ trunk/src/main/org/jboss/seam/framework/HibernateEntityController.java 2008-03-27 11:00:32 UTC (rev 7719) @@ -118,4 +118,10 @@ getSession().refresh(entity); } + @Override + protected boolean isPersistenceContextOpen(Session persistenceContext) + { + return persistenceContext.isOpen(); + } + } Modified: trunk/src/main/org/jboss/seam/framework/HibernateEntityHome.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/HibernateEntityHome.java 2008-03-27 10:37:16 UTC (rev 7718) +++ trunk/src/main/org/jboss/seam/framework/HibernateEntityHome.java 2008-03-27 11:00:32 UTC (rev 7719) @@ -119,4 +119,10 @@ } } + @Override + protected boolean isPersistenceContextOpen(Session persistenceContext) + { + return persistenceContext.isOpen(); + } + } Modified: trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-03-27 10:37:16 UTC (rev 7718) +++ trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-03-27 11:00:32 UTC (rev 7719) @@ -201,5 +201,11 @@ { this.fetchSize = fetchSize; } + + @Override + protected boolean isPersistenceContextOpen(Session persistenceContext) + { + return persistenceContext.isOpen(); + } } Modified: trunk/src/main/org/jboss/seam/framework/MutableEntityController.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/MutableEntityController.java 2008-03-27 10:37:16 UTC (rev 7718) +++ trunk/src/main/org/jboss/seam/framework/MutableEntityController.java 2008-03-27 11:00:32 UTC (rev 7719) @@ -82,4 +82,10 @@ getEntityManager().remove(entity); } + @Override + protected boolean isPersistenceContextOpen(EntityManager persistenceContext) + { + return persistenceContext.isOpen(); + } + } Modified: trunk/src/main/org/jboss/seam/framework/PersistenceController.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/PersistenceController.java 2008-03-27 10:37:16 UTC (rev 7718) +++ trunk/src/main/org/jboss/seam/framework/PersistenceController.java 2008-03-27 11:00:32 UTC (rev 7719) @@ -15,7 +15,7 @@ public T getPersistenceContext() { - if (persistenceContext==null) + if (persistenceContext==null || !isPersistenceContextOpen(persistenceContext)) { persistenceContext = (T) getComponentInstance( getPersistenceContextName() ); } @@ -28,5 +28,10 @@ } protected abstract String getPersistenceContextName(); + + protected boolean isPersistenceContextOpen(T persistenceContext) + { + return false; + } }

16 years, 8 months

1
0
0 / 0

Seam SVN: r7718 - in maven-plugins/trunk/seam-jdocbook-style/src/main: images/images and 1 other directory.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-27 06:37:16 -0400 (Thu, 27 Mar 2008) New Revision: 7718 Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/bkg_gradient.png Modified: maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css Log: Fix background image Modified: maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css =================================================================== --- maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-03-26 23:55:16 UTC (rev 7717) +++ maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-03-27 10:37:16 UTC (rev 7718) @@ -1,13 +1,7 @@ @import url(jbossorg.css); -/* -Switch to monospace font for programlisting, needed for crappy callouts -*/ -pre { - font-family: monospace; -} - body { + background-image:url(../images/bkg_gradient.png); font-family: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; } Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/bkg_gradient.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/bkg_gradient.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 8 months

1
0
0 / 0

Seam SVN: r7717 - in trunk/src/main/org/jboss/seam/security: permission and 1 other directory.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-03-26 19:55:16 -0400 (Wed, 26 Mar 2008) New Revision: 7717 Modified: trunk/src/main/org/jboss/seam/security/management/IdentityManager.java trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java trunk/src/main/org/jboss/seam/security/management/UserAction.java trunk/src/main/org/jboss/seam/security/permission/JpaAccountPermissionStore.java trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java trunk/src/main/org/jboss/seam/security/permission/PermissionMapper.java trunk/src/main/org/jboss/seam/security/permission/ResolverChain.java Log: make serializable Modified: trunk/src/main/org/jboss/seam/security/management/IdentityManager.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/IdentityManager.java 2008-03-26 20:48:12 UTC (rev 7716) +++ trunk/src/main/org/jboss/seam/security/management/IdentityManager.java 2008-03-26 23:55:16 UTC (rev 7717) @@ -3,6 +3,7 @@ import static org.jboss.seam.ScopeType.APPLICATION; import static org.jboss.seam.annotations.Install.BUILT_IN; +import java.io.Serializable; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -26,7 +27,7 @@ @Scope(APPLICATION) @Name("org.jboss.seam.security.management.identityManager") @Install(precedence = BUILT_IN) -public class IdentityManager +public class IdentityManager implements Serializable { public static final String ACCOUNT_PERMISSION_NAME = "seam.account"; Modified: trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-03-26 20:48:12 UTC (rev 7716) +++ trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-03-26 23:55:16 UTC (rev 7717) @@ -2,6 +2,7 @@ import static org.jboss.seam.ScopeType.APPLICATION; +import java.io.Serializable; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; @@ -35,7 +36,7 @@ @Install(value=false) @Scope(APPLICATION) @BypassInterceptors -public class JpaIdentityStore implements IdentityStore +public class JpaIdentityStore implements IdentityStore, Serializable { public static final String AUTHENTICATED_USER = "org.jboss.seam.security.management.authenticatedUser"; Modified: trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java 2008-03-26 20:48:12 UTC (rev 7716) +++ trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java 2008-03-26 23:55:16 UTC (rev 7717) @@ -2,6 +2,7 @@ import static org.jboss.seam.ScopeType.APPLICATION; +import java.io.Serializable; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -33,7 +34,7 @@ @Install(value=false) @Scope(APPLICATION) @BypassInterceptors -public class LdapIdentityStore implements IdentityStore +public class LdapIdentityStore implements IdentityStore, Serializable { protected FeatureSet featureSet = new FeatureSet(FeatureSet.FEATURE_ALL); Modified: trunk/src/main/org/jboss/seam/security/management/UserAction.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/UserAction.java 2008-03-26 20:48:12 UTC (rev 7716) +++ trunk/src/main/org/jboss/seam/security/management/UserAction.java 2008-03-26 23:55:16 UTC (rev 7717) @@ -2,6 +2,7 @@ import static org.jboss.seam.ScopeType.CONVERSATION; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -20,7 +21,7 @@ */ @Name("org.jboss.seam.security.userAction") @Scope(CONVERSATION) -public class UserAction +public class UserAction implements Serializable { private String firstname; private String lastname; Modified: trunk/src/main/org/jboss/seam/security/permission/JpaAccountPermissionStore.java =================================================================== --- trunk/src/main/org/jboss/seam/security/permission/JpaAccountPermissionStore.java 2008-03-26 20:48:12 UTC (rev 7716) +++ trunk/src/main/org/jboss/seam/security/permission/JpaAccountPermissionStore.java 2008-03-26 23:55:16 UTC (rev 7717) @@ -2,6 +2,7 @@ import static org.jboss.seam.ScopeType.APPLICATION; +import java.io.Serializable; import java.util.List; import javax.persistence.EntityManager; @@ -18,7 +19,7 @@ */ @Scope(APPLICATION) @BypassInterceptors -public class JpaAccountPermissionStore implements AccountPermissionStore +public class JpaAccountPermissionStore implements AccountPermissionStore, Serializable { private String entityManagerName = "entityManager"; Modified: trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java =================================================================== --- trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java 2008-03-26 20:48:12 UTC (rev 7716) +++ trunk/src/main/org/jboss/seam/security/permission/PermissionManager.java 2008-03-26 23:55:16 UTC (rev 7717) @@ -3,6 +3,7 @@ import static org.jboss.seam.ScopeType.APPLICATION; import static org.jboss.seam.annotations.Install.BUILT_IN; +import java.io.Serializable; import java.util.List; import org.jboss.seam.Component; @@ -19,7 +20,7 @@ @Scope(APPLICATION) @Name("org.jboss.seam.security.permissionManager") @Install(precedence = BUILT_IN) -public class PermissionManager +public class PermissionManager implements Serializable { public static final String ACCOUNT_PERMISSION_STORE_COMPONENT_NAME = "accountPermissionStore"; public static final String ACL_PERMISSION_STORE_COMPONENT_NAME = "aclPermissionStore"; Modified: trunk/src/main/org/jboss/seam/security/permission/PermissionMapper.java =================================================================== --- trunk/src/main/org/jboss/seam/security/permission/PermissionMapper.java 2008-03-26 20:48:12 UTC (rev 7716) +++ trunk/src/main/org/jboss/seam/security/permission/PermissionMapper.java 2008-03-26 23:55:16 UTC (rev 7717) @@ -3,6 +3,7 @@ import static org.jboss.seam.ScopeType.APPLICATION; import static org.jboss.seam.annotations.Install.BUILT_IN; +import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -26,7 +27,7 @@ @Install(precedence = BUILT_IN) @BypassInterceptors @Startup -public class PermissionMapper +public class PermissionMapper implements Serializable { private Map<Class,Map<String,String>> resolverChains = new HashMap<Class,Map<String,String>>(); Modified: trunk/src/main/org/jboss/seam/security/permission/ResolverChain.java =================================================================== --- trunk/src/main/org/jboss/seam/security/permission/ResolverChain.java 2008-03-26 20:48:12 UTC (rev 7716) +++ trunk/src/main/org/jboss/seam/security/permission/ResolverChain.java 2008-03-26 23:55:16 UTC (rev 7717) @@ -2,6 +2,7 @@ import static org.jboss.seam.ScopeType.SESSION; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -10,7 +11,7 @@ @Scope(SESSION) @BypassInterceptors -public class ResolverChain +public class ResolverChain implements Serializable { private List<PermissionResolver> resolvers = new ArrayList<PermissionResolver>();

16 years, 9 months

1
0
0 / 0

Seam SVN: r7716 - in maven-plugins/trunk: seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam and 2 other directories.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-26 16:48:12 -0400 (Wed, 26 Mar 2008) New Revision: 7716 Added: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/bkg_gradient.gif maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/caution.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/dot.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/dot2.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/important.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/note.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/red-bg.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamlogo.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-go-back.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-go-forward.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-go-up.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-home.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/support_doc.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/tip.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/title_hdr.png maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/warning.png Removed: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/hrd_bkgimage_fade.gif Modified: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-html.xsl maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/nochunk-html.xsl maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-nochunk.css maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css Log: Apply styles from ORG-44, thanks to Cheyenne Weaver! Deleted: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl =================================================================== --- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl 2008-03-26 18:59:29 UTC (rev 7715) +++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl 2008-03-26 20:48:12 UTC (rev 7716) @@ -1,278 +0,0 @@ -<?xml version='1.0'?> - - - -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:exsl="http://exslt.org/common" - version="1.0" - exclude-result-prefixes="exsl"> - -<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/docbook.xsl"/> -<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/chunk-common.xsl"/> -<xsl:include href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/manifest.xsl"/> -<xsl:include href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/chunk-code.xsl"/> - -<xsl:include href="redhat.xsl"/> -<xsl:include href="xhtml-common.xsl"/> -<xsl:include href="highlight.xsl"/> - -<xsl:param name="confidential" select="0"/> - -<xsl:param name="generate.legalnotice.link" select="1"/> -<xsl:param name="generate.revhistory.link" select="0"/> - - -<xsl:param name="chunk.section.depth" select="0"/> -<xsl:param name="chunk.first.sections" select="1"/> -<xsl:param name="chunk.toc" select="''"/> - - -<xsl:param name="ignore.image.scaling" select="1"/> - - -<xsl:output method="xml" - encoding="UTF-8" - indent="yes" - doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" - doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" - standalone="no"/> - - -<xsl:template name="process.footnotes"> - <xsl:variable name="footnotes" select=".//footnote"/> - <xsl:variable name="table.footnotes" select=".//tgroup//footnote"/> - -  - <xsl:if test="count($footnotes)>count($table.footnotes)"> - <div class="footnotes"> - - <hr/> - <xsl:apply-templates select="$footnotes" mode="process.footnote.mode"/> - </div> - </xsl:if> - - <xsl:if test="$annotation.support != 0 and //annotation"> - <div class="annotation-list"> - <div class="annotation-nocss"> - The following annotations are from this essay. You are seeing - them here because your browser doesn’t support the user-interface - techniques used to make them appear as ‘popups’ on modern browsers. - </div> - - <xsl:apply-templates select="//annotation" mode="annotation-popup"/> - </div> - </xsl:if> -</xsl:template> - - -<xsl:template name="header.navigation"> - <xsl:param name="prev" select="/foo"/> - <xsl:param name="next" select="/foo"/> - <xsl:param name="nav.context"/> - <xsl:variable name="home" select="/*[1]"/> - <xsl:variable name="up" select="parent::*"/> - <xsl:variable name="row1" select="$navig.showtitles != 0"/> - <xsl:variable name="row2" select="count($prev) > 0 or (count($up) > 0 and generate-id($up) != generate-id($home) and $navig.showtitles != 0) or count($next) > 0"/> - <xsl:if test="$suppress.navigation = '0' and $suppress.header.navigation = '0'"> - <xsl:if test="$row1 or $row2"> - <xsl:if test="$row1"> - - <xsl:attribute name="id"> - <xsl:text>title</xsl:text> - </xsl:attribute> - <a> - <xsl:attribute name="href"> - <xsl:text>http://www.jboss.org</xsl:text> - </xsl:attribute> - <xsl:attribute name="class"> - <xsl:text>jbossOrg_href</xsl:text> - </xsl:attribute> - - JBoss.org - - </a> - <a> - <xsl:attribute name="href"> - <xsl:text>http://labs.jboss.com/projects/docs</xsl:text> - </xsl:attribute> - <xsl:attribute name="class"> - <xsl:text>commDoc_href</xsl:text> - </xsl:attribute> - - Community Documentation - - </a> - - </xsl:if> - <xsl:if test="$row2"> - <ul class="docnav" xmlns="http://www.w3.org/1999/xhtml"> - <li class="previous"> - <xsl:if test="count($prev)>0"> - <a accesskey="p"> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$prev"/> - </xsl:call-template> - </xsl:attribute> - - <xsl:call-template name="navig.content"> - <xsl:with-param name="direction" select="'prev'"/> - </xsl:call-template> - - </a> - </xsl:if> - </li> - <li class="next"> - <xsl:if test="count($next)>0"> - <a accesskey="n"> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$next"/> - </xsl:call-template> - </xsl:attribute> - - <xsl:call-template name="navig.content"> - <xsl:with-param name="direction" select="'next'"/> - </xsl:call-template> - - </a> - </xsl:if> - </li> - </ul> - </xsl:if> - </xsl:if> - <xsl:if test="$header.rule != 0"> - <hr/> - </xsl:if> - </xsl:if> -</xsl:template> - - -<xsl:template name="footer.navigation"> - <xsl:param name="prev" select="/foo"/> - <xsl:param name="next" select="/foo"/> - <xsl:param name="nav.context"/> - <xsl:param name="title-limit" select="'50'"/> - <xsl:variable name="home" select="/*[1]"/> - <xsl:variable name="up" select="parent::*"/> - <xsl:variable name="row1" select="count($prev) > 0 or count($up) > 0 or count($next) > 0"/> - <xsl:variable name="row2" select="($prev and $navig.showtitles != 0) or (generate-id($home) != generate-id(.) or $nav.context = 'toc') or ($chunk.tocs.and.lots != 0 and $nav.context != 'toc') or ($next and $navig.showtitles != 0)"/> - - <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'"> - <xsl:if test="$footer.rule != 0"> - <hr/> - </xsl:if> - <xsl:if test="$row1 or $row2"> - <ul class="docnav" xmlns="http://www.w3.org/1999/xhtml"> - <xsl:if test="$row1"> - <li class="previous"> - <xsl:if test="count($prev) > 0"> - <a accesskey="p"> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$prev"/> - </xsl:call-template> - </xsl:attribute> - - <xsl:call-template name="navig.content"> - <xsl:with-param name="direction" select="'prev'"/> - </xsl:call-template> - - <xsl:variable name="text"> - <xsl:apply-templates select="$prev" mode="object.title.markup"/> - </xsl:variable> - <xsl:choose> - <xsl:when test="string-length($text) > $title-limit"> - <xsl:value-of select="concat(substring($text, 0, $title-limit), '...')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$text"/> - </xsl:otherwise> - </xsl:choose> - </a> - </xsl:if> - </li> - <xsl:if test="count($up) > 0"> - <li class="up"> - <a accesskey="u"> - <xsl:attribute name="href"> - <xsl:text>#</xsl:text> - </xsl:attribute> - - <xsl:call-template name="navig.content"> - <xsl:with-param name="direction" select="'up'"/> - </xsl:call-template> - - </a> - </li> - </xsl:if> - <xsl:if test="$home != . or $nav.context = 'toc'"> - <li class="home"> - <a accesskey="h"> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$home"/> - </xsl:call-template> - </xsl:attribute> - - <xsl:call-template name="navig.content"> - <xsl:with-param name="direction" select="'home'"/> - </xsl:call-template> - - </a> - </li> - </xsl:if> - <xsl:if test="count($next)>0"> - <li class="next"> - <a accesskey="n"> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$next"/> - </xsl:call-template> - </xsl:attribute> - - <xsl:call-template name="navig.content"> - <xsl:with-param name="direction" select="'next'"/> - </xsl:call-template> - - <xsl:variable name="text"> - <xsl:apply-templates select="$next" mode="object.title.markup"/> - </xsl:variable> - <xsl:choose> - <xsl:when test="string-length($text) > $title-limit"> - <xsl:value-of select="concat(substring($text, 0, $title-limit),'...')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$text"/> - </xsl:otherwise> - </xsl:choose> - </a> - </li> - </xsl:if> - </xsl:if> - </ul> - </xsl:if> - </xsl:if> -</xsl:template> - - -</xsl:stylesheet> Added: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl =================================================================== --- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl (rev 0) +++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl 2008-03-26 20:48:12 UTC (rev 7716) @@ -0,0 +1,281 @@ +<?xml version='1.0'?> + + + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:exsl="http://exslt.org/common" + version="1.0" + exclude-result-prefixes="exsl"> + +<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/docbook.xsl"/> +<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/chunk-common.xsl"/> +<xsl:include href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/manifest.xsl"/> +<xsl:include href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/chunk-code.xsl"/> + +<xsl:include href="redhat.xsl"/> +<xsl:include href="xhtml-common.xsl"/> +<xsl:include href="highlight.xsl"/> + +<xsl:param name="jbossOrgHref" select="'http://www.jboss.org'" /> +<xsl:param name="commDocHref" select="'http://labs.jboss.com/projects/docs'" /> + +<xsl:param name="confidential" select="0"/> + +<xsl:param name="generate.legalnotice.link" select="1"/> +<xsl:param name="generate.revhistory.link" select="0"/> + + +<xsl:param name="chunk.section.depth" select="0"/> +<xsl:param name="chunk.first.sections" select="1"/> +<xsl:param name="chunk.toc" select="''"/> + + +<xsl:param name="ignore.image.scaling" select="1"/> + + +<xsl:output method="xml" + encoding="UTF-8" + indent="yes" + doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" + doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" + standalone="no"/> + + +<xsl:template name="process.footnotes"> + <xsl:variable name="footnotes" select=".//footnote"/> + <xsl:variable name="table.footnotes" select=".//tgroup//footnote"/> + +  + <xsl:if test="count($footnotes)>count($table.footnotes)"> + <div class="footnotes"> + + <hr/> + <xsl:apply-templates select="$footnotes" mode="process.footnote.mode"/> + </div> + </xsl:if> + + <xsl:if test="$annotation.support != 0 and //annotation"> + <div class="annotation-list"> + <div class="annotation-nocss"> + The following annotations are from this essay. You are seeing + them here because your browser doesn’t support the user-interface + techniques used to make them appear as ‘popups’ on modern browsers. + </div> + + <xsl:apply-templates select="//annotation" mode="annotation-popup"/> + </div> + </xsl:if> +</xsl:template> + + +<xsl:template name="header.navigation"> + <xsl:param name="prev" select="/foo"/> + <xsl:param name="next" select="/foo"/> + <xsl:param name="nav.context"/> + <xsl:variable name="home" select="/*[1]"/> + <xsl:variable name="up" select="parent::*"/> + <xsl:variable name="row1" select="$navig.showtitles != 0"/> + <xsl:variable name="row2" select="count($prev) > 0 or (count($up) > 0 and generate-id($up) != generate-id($home) and $navig.showtitles != 0) or count($next) > 0"/> + <xsl:if test="$suppress.navigation = '0' and $suppress.header.navigation = '0'"> + <xsl:if test="$row1 or $row2"> + <xsl:if test="$row1"> + + <xsl:attribute name="id"> + <xsl:text>title</xsl:text> + </xsl:attribute> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$jbossOrgHref" /> + </xsl:attribute> + <xsl:attribute name="class"> + <xsl:text>jbossOrg_href</xsl:text> + </xsl:attribute> + + JBoss.org + + </a> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$commDocHref" /> + </xsl:attribute> + <xsl:attribute name="class"> + <xsl:text>commDoc_href</xsl:text> + </xsl:attribute> + + Community Documentation + + </a> + + </xsl:if> + <xsl:if test="$row2"> + <ul class="docnav" xmlns="http://www.w3.org/1999/xhtml"> + <li class="previous"> + <xsl:if test="count($prev)>0"> + <a accesskey="p"> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$prev"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:call-template name="navig.content"> + <xsl:with-param name="direction" select="'prev'"/> + </xsl:call-template> + + </a> + </xsl:if> + </li> + <li class="next"> + <xsl:if test="count($next)>0"> + <a accesskey="n"> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$next"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:call-template name="navig.content"> + <xsl:with-param name="direction" select="'next'"/> + </xsl:call-template> + + </a> + </xsl:if> + </li> + </ul> + </xsl:if> + </xsl:if> + <xsl:if test="$header.rule != 0"> + <hr/> + </xsl:if> + </xsl:if> +</xsl:template> + + +<xsl:template name="footer.navigation"> + <xsl:param name="prev" select="/foo"/> + <xsl:param name="next" select="/foo"/> + <xsl:param name="nav.context"/> + <xsl:param name="title-limit" select="'50'"/> + <xsl:variable name="home" select="/*[1]"/> + <xsl:variable name="up" select="parent::*"/> + <xsl:variable name="row1" select="count($prev) > 0 or count($up) > 0 or count($next) > 0"/> + <xsl:variable name="row2" select="($prev and $navig.showtitles != 0) or (generate-id($home) != generate-id(.) or $nav.context = 'toc') or ($chunk.tocs.and.lots != 0 and $nav.context != 'toc') or ($next and $navig.showtitles != 0)"/> + + <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'"> + <xsl:if test="$footer.rule != 0"> + <hr/> + </xsl:if> + <xsl:if test="$row1 or $row2"> + <ul class="docnav" xmlns="http://www.w3.org/1999/xhtml"> + <xsl:if test="$row1"> + <li class="previous"> + <xsl:if test="count($prev) > 0"> + <a accesskey="p"> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$prev"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:call-template name="navig.content"> + <xsl:with-param name="direction" select="'prev'"/> + </xsl:call-template> + + <xsl:variable name="text"> + <xsl:apply-templates select="$prev" mode="object.title.markup"/> + </xsl:variable> + <xsl:choose> + <xsl:when test="string-length($text) > $title-limit"> + <xsl:value-of select="concat(substring($text, 0, $title-limit), '...')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$text"/> + </xsl:otherwise> + </xsl:choose> + </a> + </xsl:if> + </li> + <xsl:if test="count($up) > 0"> + <li class="up"> + <a accesskey="u"> + <xsl:attribute name="href"> + <xsl:text>#</xsl:text> + </xsl:attribute> + + <xsl:call-template name="navig.content"> + <xsl:with-param name="direction" select="'up'"/> + </xsl:call-template> + + </a> + </li> + </xsl:if> + <xsl:if test="$home != . or $nav.context = 'toc'"> + <li class="home"> + <a accesskey="h"> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$home"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:call-template name="navig.content"> + <xsl:with-param name="direction" select="'home'"/> + </xsl:call-template> + + </a> + </li> + </xsl:if> + <xsl:if test="count($next)>0"> + <li class="next"> + <a accesskey="n"> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="$next"/> + </xsl:call-template> + </xsl:attribute> + + <xsl:call-template name="navig.content"> + <xsl:with-param name="direction" select="'next'"/> + </xsl:call-template> + + <xsl:variable name="text"> + <xsl:apply-templates select="$next" mode="object.title.markup"/> + </xsl:variable> + <xsl:choose> + <xsl:when test="string-length($text) > $title-limit"> + <xsl:value-of select="concat(substring($text, 0, $title-limit),'...')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$text"/> + </xsl:otherwise> + </xsl:choose> + </a> + </li> + </xsl:if> + </xsl:if> + </ul> + </xsl:if> + </xsl:if> +</xsl:template> + + +</xsl:stylesheet> Deleted: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl =================================================================== --- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl 2008-03-26 18:59:29 UTC (rev 7715) +++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl 2008-03-26 20:48:12 UTC (rev 7716) @@ -1,1245 +0,0 @@ -<?xml version='1.0'?> - - - -<!DOCTYPE xsl:stylesheet [ -<!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'"> -<!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"> - ]> - -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version='1.0' - xmlns="http://www.w3.org/TR/xhtml1/transitional" - xmlns:fo="http://www.w3.org/1999/XSL/Format" - exclude-result-prefixes="#default"> - -<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/fo/docbook.xsl"/> -<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/fo/graphics.xsl"/> -<xsl:import href="redhat.xsl"/> -<xsl:import href="highlight-pdf.xsl"/> - -<xsl:param name="alignment">justify</xsl:param> -<xsl:param name="use.extensions" select="0"/> -<xsl:param name="tablecolumns.extensions" select="0"/> -<xsl:param name="fop.extensions" select="1"/> -<xsl:param name="fop1.extensions" select="0"/> -<xsl:param name="img.src.path"/> -<xsl:param name="confidential" select="0"/> -<xsl:param name="qandadiv.autolabel" select="0"/> - -<xsl:param name="hyphenation-character">-</xsl:param> - - -<xsl:param name="hyphenate">true</xsl:param> - - -<xsl:param name="line-height" select="1.5"/> - -<xsl:attribute-set name="xref.properties"> - <xsl:attribute name="font-style">italic</xsl:attribute> - <xsl:attribute name="color"> - <xsl:choose> - <xsl:when test="ancestor::note or ancestor::caution or ancestor::important or ancestor::warning or ancestor::tip"> - <xsl:text>#aee6ff</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>#0066cc</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="monospace.properties"> - <xsl:attribute name="font-size">9pt</xsl:attribute> - <xsl:attribute name="font-family"> - <xsl:value-of select="$monospace.font.family"/> - </xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="monospace.verbatim.properties" use-attribute-sets="verbatim.properties monospace.properties"> - <xsl:attribute name="text-align">start</xsl:attribute> - <xsl:attribute name="wrap-option">wrap</xsl:attribute> - <xsl:attribute name="hyphenation-character">►</xsl:attribute> -</xsl:attribute-set> - -<xsl:param name="shade.verbatim" select="1"/> -<xsl:attribute-set name="shade.verbatim.style"> - <xsl:attribute name="wrap-option">wrap</xsl:attribute> - <xsl:attribute name="background-color"> - <xsl:choose> - <xsl:when test="ancestor::note"> <xsl:text>#B5BCBD</xsl:text> </xsl:when> - <xsl:when test="ancestor::caution"> <xsl:text>#E3A835</xsl:text> </xsl:when> - <xsl:when test="ancestor::important"> <xsl:text>#4A5D75</xsl:text> </xsl:when> - <xsl:when test="ancestor::warning"> <xsl:text>#7B1E1E</xsl:text> </xsl:when> - <xsl:when test="ancestor::tip"> <xsl:text>#7E917F</xsl:text> </xsl:when> - <xsl:otherwise> - <xsl:text>black</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="color"> - <xsl:choose> - <xsl:when test="ancestor::note"> <xsl:text>#4C5253</xsl:text> </xsl:when> - <xsl:when test="ancestor::caution"> <xsl:text>#533500</xsl:text> </xsl:when> - <xsl:when test="ancestor::important"> <xsl:text>white</xsl:text> </xsl:when> - <xsl:when test="ancestor::warning"> <xsl:text>white</xsl:text> </xsl:when> - <xsl:when test="ancestor::tip"> <xsl:text>white</xsl:text> </xsl:when> - <xsl:otherwise> - <xsl:text>red</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="padding-left">12pt</xsl:attribute> - <xsl:attribute name="padding-right">12pt</xsl:attribute> - <xsl:attribute name="padding-top">6pt</xsl:attribute> - <xsl:attribute name="padding-bottom">6pt</xsl:attribute> - <xsl:attribute name="margin-left"> - <xsl:value-of select="$title.margin.left"/> - </xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="verbatim.properties"> - <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> - <xsl:attribute name="space-before.optimum">1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute> - <xsl:attribute name="space-after.optimum">1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">1.2em</xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="wrap-option">wrap</xsl:attribute> - <xsl:attribute name="white-space-collapse">false</xsl:attribute> - <xsl:attribute name="white-space-treatment">preserve</xsl:attribute> - <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute> - <xsl:attribute name="text-align">start</xsl:attribute> -</xsl:attribute-set> - - -<xsl:param name="admon.graphics" select="1"/> -<xsl:param name="admon.graphics.path"> - <xsl:if test="$img.src.path != ''"><xsl:value-of select="$img.src.path"/></xsl:if><xsl:text>images/</xsl:text> -</xsl:param> -<xsl:param name="admon.graphics.extension" select="'.svg'"/> -<xsl:attribute-set name="admonition.title.properties"> - <xsl:attribute name="font-size">13pt</xsl:attribute> -  - - <xsl:attribute name="color"> - <xsl:choose> - <xsl:when test="self::note">#4C5253</xsl:when> - <xsl:when test="self::caution">#533500</xsl:when> - <xsl:when test="self::important">white</xsl:when> - <xsl:when test="self::warning">white</xsl:when> - <xsl:when test="self::tip">white</xsl:when> - <xsl:otherwise>white</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> - -</xsl:attribute-set> - - - -<xsl:attribute-set name="graphical.admonition.properties"> - - <xsl:attribute name="color"> - <xsl:choose> - <xsl:when test="self::note">#4C5253</xsl:when> - <xsl:when test="self::caution">#533500</xsl:when> - <xsl:when test="self::important">white</xsl:when> - <xsl:when test="self::warning">white</xsl:when> - <xsl:when test="self::tip">white</xsl:when> - <xsl:otherwise>white</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="background-color"> - <xsl:choose> - <xsl:when test="self::note">#B5BCBD</xsl:when> - <xsl:when test="self::caution">#E3A835</xsl:when> - <xsl:when test="self::important">#4A5D75</xsl:when> - <xsl:when test="self::warning">#7B1E1E</xsl:when> - <xsl:when test="self::tip">#7E917F</xsl:when> - <xsl:otherwise>#404040</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - - <xsl:attribute name="space-before.optimum">1em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> - <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute> - <xsl:attribute name="space-after.optimum">1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute> - <xsl:attribute name="space-after.maximum">1em</xsl:attribute> - <xsl:attribute name="padding-bottom">12pt</xsl:attribute> - <xsl:attribute name="padding-top">12pt</xsl:attribute> - <xsl:attribute name="padding-right">12pt</xsl:attribute> - <xsl:attribute name="padding-left">12pt</xsl:attribute> - <xsl:attribute name="margin-left"> - <xsl:value-of select="$title.margin.left"/> - </xsl:attribute> -</xsl:attribute-set> - -<xsl:param name="generate.toc"> -set toc -book toc -article toc -</xsl:param> - -<xsl:param name="toc.section.depth">3</xsl:param> -<xsl:param name="section.autolabel" select="1"/> - -<xsl:param name="callout.graphics.path"> - <xsl:if test="$img.src.path != ''"><xsl:value-of select="$img.src.path"/></xsl:if><xsl:text>images/</xsl:text> -</xsl:param> - - -<xsl:param name="variablelist.as.blocks">1</xsl:param> - - -<xsl:attribute-set name="list.block.spacing"> - <xsl:attribute name="space-before.optimum">2em</xsl:attribute> - <xsl:attribute name="space-before.minimum">1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">3em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> -</xsl:attribute-set> - - -<xsl:attribute-set name="table.cell.padding"> -<xsl:attribute name="padding-left">4pt</xsl:attribute> -<xsl:attribute name="padding-right">4pt</xsl:attribute> -<xsl:attribute name="padding-top">2pt</xsl:attribute> -<xsl:attribute name="padding-bottom">2pt</xsl:attribute> -</xsl:attribute-set> - - -<xsl:param name="table.frame.border.thickness">0.3pt</xsl:param> -<xsl:param name="table.cell.border.thickness">0.15pt</xsl:param> -<xsl:param name="table.cell.border.color">#5c5c4f</xsl:param> -<xsl:param name="table.frame.border.color">#5c5c4f</xsl:param> -<xsl:param name="table.cell.border.right.color">white</xsl:param> -<xsl:param name="table.cell.border.left.color">white</xsl:param> -<xsl:param name="table.frame.border.right.color">white</xsl:param> -<xsl:param name="table.frame.border.left.color">white</xsl:param> - -<xsl:param name="paper.type" select="'A4'"/> -<xsl:param name="double.sided">1</xsl:param> -<xsl:param name="headers.on.blank.pages">1</xsl:param> -<xsl:param name="footers.on.blank.pages">1</xsl:param> - -<xsl:param name="header.column.widths" select="'1 0 1'"/> -<xsl:param name="footer.column.widths" select="'1 1 1'"/> -<xsl:param name="header.rule" select="1"/> - - -<xsl:param name="page.margin.top">15mm</xsl:param> -<xsl:param name="region.before.extent">10mm</xsl:param> -<xsl:param name="body.margin.top">15mm</xsl:param> - -<xsl:param name="body.margin.bottom">15mm</xsl:param> -<xsl:param name="region.after.extent">10mm</xsl:param> -<xsl:param name="page.margin.bottom">15mm</xsl:param> - -<xsl:param name="page.margin.outer">30mm</xsl:param> -<xsl:param name="page.margin.inner">30mm</xsl:param> - - - -<xsl:param name="body.start.indent">0pt</xsl:param> - -<xsl:param name="title.color">#4a5d75</xsl:param> - -<xsl:attribute-set name="section.title.level1.properties"> - <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.6"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> -<xsl:attribute-set name="section.title.level2.properties"> - <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.4"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> -<xsl:attribute-set name="section.title.level3.properties"> - <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.3"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> -<xsl:attribute-set name="section.title.level4.properties"> - <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.2"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> -<xsl:attribute-set name="section.title.level5.properties"> - <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.1"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> -<xsl:attribute-set name="section.title.level6.properties"> - <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="section.title.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$title.font.family"/> - </xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> -  - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> - <xsl:attribute name="space-before.optimum">1.0em</xsl:attribute> - <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute> - <xsl:attribute name="text-align">left</xsl:attribute> - <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="book.titlepage.recto.style"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$title.fontset"/> - </xsl:attribute> - <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="font-size">12pt</xsl:attribute> - <xsl:attribute name="text-align">center</xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="component.title.properties"> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> - <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> - <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> - <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="color"> - <xsl:choose> - <xsl:when test="not(parent::chapter | parent::article | parent::appendix)"><xsl:value-of select="$title.color"/></xsl:when> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="text-align"> - <xsl:choose> - <xsl:when test="((parent::article | parent::articleinfo) and not(ancestor::book) and not(self::bibliography)) or (parent::slides | parent::slidesinfo)">center</xsl:when> - <xsl:otherwise>left</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="chapter.titlepage.recto.style"> - <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> - <xsl:attribute name="background-color">white</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:choose> - <xsl:when test="$l10n.gentext.language = 'ja-JP'"> - <xsl:value-of select="$body.font.master * 1.7"/> - <xsl:text>pt</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>24pt</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="text-align">left</xsl:attribute> -  - <xsl:attribute name="padding-left">1em</xsl:attribute> - <xsl:attribute name="padding-right">1em</xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="preface.titlepage.recto.style"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$title.fontset"/> - </xsl:attribute> - <xsl:attribute name="color">#4a5d75</xsl:attribute> - <xsl:attribute name="font-size">12pt</xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="part.titlepage.recto.style"> - <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> - <xsl:attribute name="text-align">center</xsl:attribute> -</xsl:attribute-set> - - - -<xsl:template name="table.cell.block.properties"> -  - <xsl:if test="ancestor::thead or ancestor::tfoot"> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="background-color">#4a5d75</xsl:attribute> - <xsl:attribute name="color">white</xsl:attribute> - </xsl:if> -</xsl:template> - - - -<xsl:template name="table.row.properties"> - <xsl:variable name="bgcolor"> - <xsl:call-template name="dbfo-attribute"> - <xsl:with-param name="pis" select="processing-instruction('dbfo')"/> - <xsl:with-param name="attribute" select="'bgcolor'"/> - </xsl:call-template> - </xsl:variable> - <xsl:if test="$bgcolor != ''"> - <xsl:attribute name="background-color"> - <xsl:value-of select="$bgcolor"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="ancestor::thead or ancestor::tfoot"> - <xsl:attribute name="background-color">#4a5d75</xsl:attribute> - </xsl:if> -</xsl:template> - - -<xsl:template match="title" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:call-template name="component.title.nomarkup"> -<xsl:with-param name="node" select="ancestor-or-self::appendix[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - - -<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:value-of select="."/> -</fo:block> -</xsl:template> - - -<xsl:template name="preface.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style" margin-left="{$title.margin.left}"> -<xsl:call-template name="component.title.nomarkup"> -<xsl:with-param name="node" select="ancestor-or-self::preface[1]"/> -</xsl:call-template></fo:block> - <xsl:choose> - <xsl:when test="prefaceinfo/subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/> - </xsl:when> - <xsl:when test="docinfo/subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/> - </xsl:when> - <xsl:when test="info/subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/subtitle"/> - </xsl:when> - <xsl:when test="subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/corpauthor"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/authorgroup"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/author"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/othercredit"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/othercredit"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/othercredit"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/releaseinfo"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/copyright"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/legalnotice"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/pubdate"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revision"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revhistory"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/abstract"/> -</xsl:template> - - -<xsl:template name="pickfont-sans"> - <xsl:variable name="font"> - <xsl:choose> - <xsl:when test="$l10n.gentext.language = 'ja-JP'"> - <xsl:text>KochiMincho,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'ko-KR'"> - <xsl:text>BaekmukBatang,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'zh-CN'"> - <xsl:text>ARPLKaitiMGB,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'bn-IN'"> - <xsl:text>LohitBengali,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'ta-IN'"> - <xsl:text>LohitTamil,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'pa-IN'"> - <xsl:text>LohitPunjabi,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'hi-IN'"> - <xsl:text>LohitHindi,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'gu-IN'"> - <xsl:text>LohitGujarati,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'zh-TW'"> - <xsl:text>ARPLMingti2LBig5,</xsl:text> - </xsl:when> - </xsl:choose> - </xsl:variable> - <xsl:choose> - <xsl:when test="$fop1.extensions != 0"> - <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,sans-serif</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$font"/><xsl:text>sans-serif</xsl:text> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="pickfont-serif"> - <xsl:variable name="font"> - <xsl:choose> - <xsl:when test="$l10n.gentext.language = 'ja-JP'"> - <xsl:text>KochiMincho,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'ko-KR'"> - <xsl:text>BaekmukBatang,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'zh-CN'"> - <xsl:text>ARPLKaitiMGB,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'bn-IN'"> - <xsl:text>LohitBengali,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'ta-IN'"> - <xsl:text>LohitTamil,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'pa-IN'"> - <xsl:text>LohitPunjabi,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'hi-IN'"> - <xsl:text>LohitHindi,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'gu-IN'"> - <xsl:text>LohitGujarati,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'zh-TW'"> - <xsl:text>ARPLMingti2LBig5,</xsl:text> - </xsl:when> - </xsl:choose> - </xsl:variable> - <xsl:choose> - <xsl:when test="$fop1.extensions != 0"> - <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,serif</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$font"/><xsl:text>serif</xsl:text> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="pickfont-mono"> - <xsl:variable name="font"> - <xsl:choose> - <xsl:when test="$l10n.gentext.language = 'ja-JP'"> - <xsl:text>KochiMincho,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'ko-KR'"> - <xsl:text>BaekmukBatang,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'zh-CN'"> - <xsl:text>ARPLKaitiMGB,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'bn-IN'"> - <xsl:text>LohitBengali,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'ta-IN'"> - <xsl:text>LohitTamil,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'pa-IN'"> - <xsl:text>LohitPunjabi,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'hi-IN'"> - <xsl:text>LohitHindi,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'gu-IN'"> - <xsl:text>LohitGujarati,</xsl:text> - </xsl:when> - <xsl:when test="$l10n.gentext.language = 'zh-TW'"> - <xsl:text>ARPLMingti2LBig5,</xsl:text> - </xsl:when> - </xsl:choose> - </xsl:variable> - <xsl:choose> - <xsl:when test="$fop1.extensions != 0"> - <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,monospace</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$font"/><xsl:text>monospace</xsl:text> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - -<xsl:param name="title.font.family"> - <xsl:call-template name="pickfont-sans"/> -</xsl:param> - -<xsl:param name="body.font.family"> - <xsl:call-template name="pickfont-sans"/> -</xsl:param> - -<xsl:param name="monospace.font.family"> - <xsl:call-template name="pickfont-mono"/> -</xsl:param> - -<xsl:param name="sans.font.family"> - <xsl:call-template name="pickfont-sans"/> -</xsl:param> - - - - - -<xsl:template match="address"> - <xsl:param name="suppress-numbers" select="'0'"/> - - <xsl:variable name="content"> - <xsl:choose> - <xsl:when test="$suppress-numbers = '0' - and @linenumbering = 'numbered' - and $use.extensions != '0' - and $linenumbering.extension != '0'"> - <xsl:call-template name="number.rtf.lines"> - <xsl:with-param name="rtf"> - <xsl:apply-templates/> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <fo:block wrap-option='no-wrap' - white-space-collapse='false' - white-space-treatment='preserve' - linefeed-treatment="preserve" - text-align="start" - xsl:use-attribute-sets="verbatim.properties"> - <xsl:copy-of select="$content"/> - </fo:block> -</xsl:template> - -<xsl:template name="component.title.nomarkup"> - <xsl:param name="node" select="."/> - - <xsl:variable name="id"> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select="$node"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="title"> - <xsl:apply-templates select="$node" mode="object.title.markup"> - <xsl:with-param name="allow-anchors" select="1"/> - </xsl:apply-templates> - </xsl:variable> - <xsl:copy-of select="$title"/> -</xsl:template> - - -<xsl:template name="header.content"> - <xsl:param name="pageclass" select="''"/> - <xsl:param name="sequence" select="''"/> - <xsl:param name="position" select="''"/> - <xsl:param name="gentext-key" select="''"/> - <xsl:param name="title-limit" select="'30'"/> - -  -  - <xsl:choose> -  - <xsl:when test="$confidential = 1 and (($sequence='odd' and $position='left') or ($sequence='even' and $position='right'))"> - <fo:inline keep-together.within-line="always" font-weight="bold"> - <xsl:text>RED HAT CONFIDENTIAL</xsl:text> - </fo:inline> - </xsl:when> - <xsl:when test="$sequence = 'blank'"> -  - </xsl:when> -  - <xsl:when test="($sequence='first' and $position='left' and $gentext-key='chapter')"> - <xsl:variable name="text"> - <xsl:call-template name="component.title.nomarkup"/> - </xsl:variable> - <xsl:variable name="chapt"> - <xsl:value-of select="substring-before($text, ' ')"/> - </xsl:variable> - <xsl:variable name="remainder"> - <xsl:value-of select="substring-after($text, ' ')"/> - </xsl:variable> - <xsl:variable name="chapt-num"> - <xsl:value-of select="substring-before($remainder, ' ')"/> - </xsl:variable> - <xsl:variable name="text1"> - <xsl:value-of select="concat($chapt, ' ', $chapt-num)"/> - </xsl:variable> - <fo:inline keep-together.within-line="always" font-weight="bold"> - <xsl:value-of select="$text1"/> - </fo:inline> - </xsl:when> -  - <xsl:when test="($sequence='even' and $position='left')"> -  - <xsl:variable name="text"> - <xsl:call-template name="component.title.nomarkup"/> - </xsl:variable> - <fo:inline keep-together.within-line="always" font-weight="bold"> - <xsl:choose> - <xsl:when test="string-length($text) > '33'"> - <xsl:value-of select="concat(substring($text, 0, $title-limit), '...')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$text"/> - </xsl:otherwise> - </xsl:choose> - </fo:inline> -  - </xsl:when> - <xsl:when test="($sequence='odd' and $position='right')"> -  - <fo:inline keep-together.within-line="always"><fo:retrieve-marker retrieve-class-name="section.head.marker" retrieve-position="first-including-carryover" retrieve-boundary="page-sequence"/></fo:inline> -  - </xsl:when> - <xsl:when test="$position='left'"> -  - <xsl:call-template name="draft.text"/> - </xsl:when> - <xsl:when test="$position='center'"> -  - </xsl:when> - <xsl:when test="$position='right'"> -  - <xsl:call-template name="draft.text"/> - </xsl:when> - <xsl:when test="$sequence = 'first'"> -  - </xsl:when> - <xsl:when test="$sequence = 'blank'"> -  - </xsl:when> - </xsl:choose> -</xsl:template> - - -<xsl:template name="head.sep.rule"> - <xsl:param name="pageclass"/> - <xsl:param name="sequence"/> - <xsl:param name="gentext-key"/> - - <xsl:if test="$header.rule != 0"> - <xsl:attribute name="border-bottom-width">0.5pt</xsl:attribute> - <xsl:attribute name="border-bottom-style">solid</xsl:attribute> - <xsl:attribute name="border-bottom-color">#4a5d75</xsl:attribute> - </xsl:if> -</xsl:template> - - -<xsl:template name="foot.sep.rule"> - <xsl:param name="pageclass"/> - <xsl:param name="sequence"/> - <xsl:param name="gentext-key"/> - - <xsl:if test="$footer.rule != 0"> - <xsl:attribute name="border-top-width">0.5pt</xsl:attribute> - <xsl:attribute name="border-top-style">solid</xsl:attribute> - <xsl:attribute name="border-top-color">#4a5d75</xsl:attribute> - </xsl:if> -</xsl:template> - -<xsl:param name="footnote.font.size"> - <xsl:value-of select="$body.font.master * 0.8"/><xsl:text>pt</xsl:text> -</xsl:param> -<xsl:param name="footnote.number.format" select="'1'"/> -<xsl:param name="footnote.number.symbols" select="''"/> -<xsl:attribute-set name="footnote.mark.properties"> - <xsl:attribute name="font-size">75%</xsl:attribute> - <xsl:attribute name="font-weight">normal</xsl:attribute> - <xsl:attribute name="font-style">normal</xsl:attribute> -</xsl:attribute-set> -<xsl:attribute-set name="footnote.properties"> - <xsl:attribute name="padding-top">48pt</xsl:attribute> - <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"/></xsl:attribute> - <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"/></xsl:attribute> - <xsl:attribute name="font-weight">normal</xsl:attribute> - <xsl:attribute name="font-style">normal</xsl:attribute> - <xsl:attribute name="text-align"><xsl:value-of select="$alignment"/></xsl:attribute> - <xsl:attribute name="start-indent">0pt</xsl:attribute> -</xsl:attribute-set> -<xsl:attribute-set name="footnote.sep.leader.properties"> - <xsl:attribute name="color">black</xsl:attribute> - <xsl:attribute name="leader-pattern">rule</xsl:attribute> - <xsl:attribute name="leader-length">1in</xsl:attribute> -</xsl:attribute-set> - -<xsl:template match="author" mode="tablerow.titlepage.mode"> - <fo:table-row> - <fo:table-cell> - <fo:block> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Author'"/> - </xsl:call-template> - </fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block> - <xsl:call-template name="person.name"> - <xsl:with-param name="node" select="."/> - </xsl:call-template> - </fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block> - <xsl:apply-templates select="email"/> - </fo:block> - </fo:table-cell> - </fo:table-row> -</xsl:template> - -<xsl:template match="author" mode="titlepage.mode"> - <fo:block> - <xsl:call-template name="person.name"> - <xsl:with-param name="node" select="."/> - </xsl:call-template> - </fo:block> -</xsl:template> - -<xsl:param name="editedby.enabled">0</xsl:param> - -<xsl:template match="editor" mode="tablerow.titlepage.mode"> - <fo:table-row> - <fo:table-cell> - <fo:block> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Editor'"/> - </xsl:call-template> - </fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block> - <xsl:call-template name="person.name"> - <xsl:with-param name="node" select="."/> - </xsl:call-template> - </fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block> - <xsl:apply-templates select="email"/> - </fo:block> - </fo:table-cell> - </fo:table-row> -</xsl:template> - -<xsl:template match="othercredit" mode="tablerow.titlepage.mode"> - <fo:table-row> - <fo:table-cell> - <fo:block> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'translator'"/> - </xsl:call-template> - </fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block> - <xsl:call-template name="person.name"> - <xsl:with-param name="node" select="."/> - </xsl:call-template> - </fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block> - <xsl:apply-templates select="email"/> - </fo:block> - </fo:table-cell> - </fo:table-row> - </xsl:template> - - - - -<xsl:template match="title" mode="book.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="20pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}"> -<xsl:call-template name="division.title"> -<xsl:with-param name="node" select="ancestor-or-self::book[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="34pt" space-before="30pt" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="issuenum" mode="book.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="16pt" space-before="15.552pt" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="author" mode="book.titlepage.recto.auto.mode"> - <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" font-size="14pt" space-before="15.552pt"> - <xsl:call-template name="person.name"> - <xsl:with-param name="node" select="."/> - </xsl:call-template> - </fo:block> -</xsl:template> - -<xsl:template name="book.titlepage.recto"> - <xsl:choose> - <xsl:when test="bookinfo/title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/> - </xsl:when> - <xsl:when test="info/title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/> - </xsl:when> - <xsl:when test="title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/issuenum"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/issuenum"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="issuenum"/> - - <xsl:choose> - <xsl:when test="bookinfo/subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/> - </xsl:when> - <xsl:when test="info/subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/> - </xsl:when> - <xsl:when test="subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/> - - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup/author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup/author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/> - - <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/invpartnumber"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/invpartnumber"/> - </fo:block> - <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'isbn'"/> - </xsl:call-template> - <xsl:text>: </xsl:text> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/isbn"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/isbn"/> - </fo:block> - <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'pubdate'"/> - </xsl:call-template> - <xsl:text>: </xsl:text> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/> - </fo:block> -</xsl:template> - -<xsl:template name="book.titlepage.verso"> - <xsl:choose> - <xsl:when test="bookinfo/abstract"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/> - </xsl:when> - <xsl:when test="info/abstract"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="book.titlepage3.recto"> - <xsl:choose> - <xsl:when test="bookinfo/title"> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/> - </xsl:when> - <xsl:when test="info/title"> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/title"/> - </xsl:when> - <xsl:when test="title"> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="title"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/authorgroup"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/author"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/author"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/othercredit"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/othercredit"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/copyright"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/copyright"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/legalnotice"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/legalnotice"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/publisher"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/publisher"/> -</xsl:template> - -<xsl:template name="book.titlepage.separator"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/> -</xsl:template> - -<xsl:template name="book.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="book.titlepage.before.verso"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/> -</xsl:template> - -<xsl:template name="book.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:call-template name="book.titlepage.before.recto"/> - <fo:block><xsl:call-template name="book.titlepage.recto"/></fo:block> - <xsl:call-template name="book.titlepage.separator"/> - <fo:block><xsl:call-template name="book.titlepage.verso"/></fo:block> - <xsl:call-template name="book.titlepage.separator"/> - <fo:block><xsl:call-template name="book.titlepage3.recto"/></fo:block> - <xsl:call-template name="book.titlepage.separator"/> - </fo:block> -</xsl:template> - - - -<xsl:template match="question"> - <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> - - <xsl:variable name="entry.id"> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select="parent::*"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="deflabel"> - <xsl:choose> - <xsl:when test="ancestor-or-self::*[@defaultlabel]"> - <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()] - /@defaultlabel"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$qanda.defaultlabel"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <fo:list-item id="{$entry.id}" xsl:use-attribute-sets="list.item.spacing"> - <fo:list-item-label end-indent="label-end()"> - <xsl:choose> - <xsl:when test="$deflabel = 'none'"> - <fo:block/> - </xsl:when> - <xsl:otherwise> - <fo:block> - <xsl:apply-templates select="." mode="label.markup"/> - <xsl:if test="$deflabel = 'number' and not(label)"> - <xsl:apply-templates select="." mode="intralabel.punctuation"/> - </xsl:if> - </fo:block> - </xsl:otherwise> - </xsl:choose> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <xsl:choose> - <xsl:when test="$deflabel = 'none'"> - <fo:block font-weight="bold"> - <xsl:apply-templates select="*[local-name(.)!='label']"/> - </fo:block> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="*[local-name(.)!='label']"/> - </xsl:otherwise> - </xsl:choose> -  -  - </fo:list-item-body> - </fo:list-item> -</xsl:template> - - -<xsl:template match="answer"> - <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> - <xsl:variable name="entry.id"> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select="parent::*"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="deflabel"> - <xsl:choose> - <xsl:when test="ancestor-or-self::*[@defaultlabel]"> - <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()] - /@defaultlabel"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$qanda.defaultlabel"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <fo:list-item xsl:use-attribute-sets="list.item.spacing"> - <fo:list-item-label end-indent="label-end()"> - <xsl:choose> - <xsl:when test="$deflabel = 'none'"> - <fo:block/> - </xsl:when> - <xsl:otherwise> - <fo:block> - <xsl:variable name="answer.label"> - <xsl:apply-templates select="." mode="label.markup"/> - </xsl:variable> - <xsl:copy-of select="$answer.label"/> - </fo:block> - </xsl:otherwise> - </xsl:choose> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <xsl:apply-templates select="*[local-name(.)!='label']"/> - </fo:list-item-body> - </fo:list-item> -</xsl:template> - -<xsl:param name="programlisting.font" select="'verdana,helvetica,sans-serif'" /> - -</xsl:stylesheet> Added: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl =================================================================== --- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl (rev 0) +++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl 2008-03-26 20:48:12 UTC (rev 7716) @@ -0,0 +1,1250 @@ +<?xml version='1.0'?> + + + +<!DOCTYPE xsl:stylesheet [ +<!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'"> +<!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"> + ]> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version='1.0' + xmlns="http://www.w3.org/TR/xhtml1/transitional" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + exclude-result-prefixes="#default"> + +<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/fo/docbook.xsl"/> +<xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/fo/graphics.xsl"/> +<xsl:import href="redhat.xsl"/> +<xsl:import href="highlight-pdf.xsl"/> + +<xsl:param name="alignment">justify</xsl:param> +<xsl:param name="use.extensions" select="0"/> +<xsl:param name="tablecolumns.extensions" select="0"/> +<xsl:param name="fop.extensions" select="1"/> +<xsl:param name="fop1.extensions" select="0"/> +<xsl:param name="img.src.path"/> +<xsl:param name="confidential" select="0"/> +<xsl:param name="qandadiv.autolabel" select="0"/> + +<xsl:param name="hyphenation-character">-</xsl:param> + + +<xsl:param name="hyphenate">true</xsl:param> + + +<xsl:param name="line-height" select="1.5"/> + +<xsl:attribute-set name="xref.properties"> + <xsl:attribute name="font-style">italic</xsl:attribute> + <xsl:attribute name="color"> + <xsl:choose> + <xsl:when test="ancestor::note or ancestor::caution or ancestor::important or ancestor::warning or ancestor::tip"> + <xsl:text>#aee6ff</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>#0066cc</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> +</xsl:attribute-set> + +<xsl:attribute-set name="monospace.properties"> + <xsl:attribute name="font-size">9pt</xsl:attribute> + <xsl:attribute name="font-family"> + <xsl:value-of select="$monospace.font.family"/> + </xsl:attribute> +</xsl:attribute-set> + +<xsl:attribute-set name="monospace.verbatim.properties" use-attribute-sets="verbatim.properties monospace.properties"> + <xsl:attribute name="text-align">start</xsl:attribute> + <xsl:attribute name="wrap-option">wrap</xsl:attribute> + <xsl:attribute name="hyphenation-character">►</xsl:attribute> +</xsl:attribute-set> + +<xsl:param name="shade.verbatim" select="1"/> +<xsl:attribute-set name="shade.verbatim.style"> + <xsl:attribute name="wrap-option">wrap</xsl:attribute> + <xsl:attribute name="background-color"> + <xsl:choose> + <xsl:when test="ancestor::note"> <xsl:text>#B5BCBD</xsl:text> </xsl:when> + <xsl:when test="ancestor::caution"> <xsl:text>#E3A835</xsl:text> </xsl:when> + <xsl:when test="ancestor::important"> <xsl:text>#4A5D75</xsl:text> </xsl:when> + <xsl:when test="ancestor::warning"> <xsl:text>#7B1E1E</xsl:text> </xsl:when> + <xsl:when test="ancestor::tip"> <xsl:text>#7E917F</xsl:text> </xsl:when> + <xsl:otherwise> + <xsl:text>black</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:attribute name="color"> + <xsl:choose> + <xsl:when test="ancestor::note"> <xsl:text>#4C5253</xsl:text> </xsl:when> + <xsl:when test="ancestor::caution"> <xsl:text>#533500</xsl:text> </xsl:when> + <xsl:when test="ancestor::important"> <xsl:text>white</xsl:text> </xsl:when> + <xsl:when test="ancestor::warning"> <xsl:text>white</xsl:text> </xsl:when> + <xsl:when test="ancestor::tip"> <xsl:text>white</xsl:text> </xsl:when> + <xsl:otherwise> + <xsl:text>red</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:attribute name="padding-left">12pt</xsl:attribute> + <xsl:attribute name="padding-right">12pt</xsl:attribute> + <xsl:attribute name="padding-top">6pt</xsl:attribute> + <xsl:attribute name="padding-bottom">6pt</xsl:attribute> + <xsl:attribute name="margin-left"> + <xsl:value-of select="$title.margin.left"/> + </xsl:attribute> +</xsl:attribute-set> + +<xsl:attribute-set name="verbatim.properties"> + <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> + <xsl:attribute name="space-before.optimum">1em</xsl:attribute> + <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute> + <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute> + <xsl:attribute name="space-after.optimum">1em</xsl:attribute> + <xsl:attribute name="space-after.maximum">1.2em</xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> + <xsl:attribute name="wrap-option">wrap</xsl:attribute> + <xsl:attribute name="white-space-collapse">false</xsl:attribute> + <xsl:attribute name="white-space-treatment">preserve</xsl:attribute> + <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute> + <xsl:attribute name="text-align">start</xsl:attribute> +</xsl:attribute-set> + + +<xsl:param name="admon.graphics" select="1"/> +<xsl:param name="admon.graphics.path"> + <xsl:if test="$img.src.path != ''"><xsl:value-of select="$img.src.path"/></xsl:if><xsl:text>images/</xsl:text> +</xsl:param> +<xsl:param name="admon.graphics.extension" select="'.svg'"/> +<xsl:attribute-set name="admonition.title.properties"> + <xsl:attribute name="font-size">13pt</xsl:attribute> +  + + <xsl:attribute name="color"> + <xsl:choose> + <xsl:when test="self::note">#4C5253</xsl:when> + <xsl:when test="self::caution">#533500</xsl:when> + <xsl:when test="self::important">white</xsl:when> + <xsl:when test="self::warning">white</xsl:when> + <xsl:when test="self::tip">white</xsl:when> + <xsl:otherwise>white</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + +</xsl:attribute-set> + + + +<xsl:attribute-set name="graphical.admonition.properties"> + + <xsl:attribute name="color"> + <xsl:choose> + <xsl:when test="self::note">#4C5253</xsl:when> + <xsl:when test="self::caution">#533500</xsl:when> + <xsl:when test="self::important">white</xsl:when> + <xsl:when test="self::warning">white</xsl:when> + <xsl:when test="self::tip">white</xsl:when> + <xsl:otherwise>white</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:attribute name="background-color"> + <xsl:choose> + <xsl:when test="self::note">#B5BCBD</xsl:when> + <xsl:when test="self::caution">#E3A835</xsl:when> + <xsl:when test="self::important">#4A5D75</xsl:when> + <xsl:when test="self::warning">#7B1E1E</xsl:when> + <xsl:when test="self::tip">#7E917F</xsl:when> + <xsl:otherwise>#404040</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + + <xsl:attribute name="space-before.optimum">1em</xsl:attribute> + <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> + <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute> + <xsl:attribute name="space-after.optimum">1em</xsl:attribute> + <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute> + <xsl:attribute name="space-after.maximum">1em</xsl:attribute> + <xsl:attribute name="padding-bottom">12pt</xsl:attribute> + <xsl:attribute name="padding-top">12pt</xsl:attribute> + <xsl:attribute name="padding-right">12pt</xsl:attribute> + <xsl:attribute name="padding-left">12pt</xsl:attribute> + <xsl:attribute name="margin-left"> + <xsl:value-of select="$title.margin.left"/> + </xsl:attribute> +</xsl:attribute-set> + +<xsl:param name="generate.toc"> +set toc +book toc +article toc +</xsl:param> + +<xsl:param name="toc.section.depth">3</xsl:param> +<xsl:param name="section.autolabel" select="1"/> + +<xsl:param name="callout.graphics.path"> + <xsl:if test="$img.src.path != ''"><xsl:value-of select="$img.src.path"/></xsl:if><xsl:text>images/</xsl:text> +</xsl:param> + + +<xsl:param name="variablelist.as.blocks">1</xsl:param> + + +<xsl:attribute-set name="list.block.spacing"> + <xsl:attribute name="space-before.optimum">2em</xsl:attribute> + <xsl:attribute name="space-before.minimum">1em</xsl:attribute> + <xsl:attribute name="space-before.maximum">3em</xsl:attribute> + <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> + <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> + <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> +</xsl:attribute-set> + + +<xsl:attribute-set name="table.cell.padding"> +<xsl:attribute name="padding-left">4pt</xsl:attribute> +<xsl:attribute name="padding-right">4pt</xsl:attribute> +<xsl:attribute name="padding-top">2pt</xsl:attribute> +<xsl:attribute name="padding-bottom">2pt</xsl:attribute> +</xsl:attribute-set> + + +<xsl:param name="table.frame.border.thickness">0.3pt</xsl:param> +<xsl:param name="table.cell.border.thickness">0.15pt</xsl:param> +<xsl:param name="table.cell.border.color">#5c5c4f</xsl:param> +<xsl:param name="table.frame.border.color">#5c5c4f</xsl:param> +<xsl:param name="table.cell.border.right.color">white</xsl:param> +<xsl:param name="table.cell.border.left.color">white</xsl:param> +<xsl:param name="table.frame.border.right.color">white</xsl:param> +<xsl:param name="table.frame.border.left.color">white</xsl:param> + +<xsl:param name="paper.type" select="'A4'"/> +<xsl:param name="double.sided">1</xsl:param> +<xsl:param name="headers.on.blank.pages">1</xsl:param> +<xsl:param name="footers.on.blank.pages">1</xsl:param> + +<xsl:param name="header.column.widths" select="'1 0 1'"/> +<xsl:param name="footer.column.widths" select="'1 1 1'"/> +<xsl:param name="header.rule" select="1"/> + + +<xsl:param name="page.margin.top">15mm</xsl:param> +<xsl:param name="region.before.extent">10mm</xsl:param> +<xsl:param name="body.margin.top">15mm</xsl:param> + +<xsl:param name="body.margin.bottom">15mm</xsl:param> +<xsl:param name="region.after.extent">10mm</xsl:param> +<xsl:param name="page.margin.bottom">15mm</xsl:param> + +<xsl:param name="page.margin.outer">30mm</xsl:param> +<xsl:param name="page.margin.inner">30mm</xsl:param> + + + +<xsl:param name="body.start.indent">0pt</xsl:param> + +<xsl:param name="title.color">#4a5d75</xsl:param> + +<xsl:attribute-set name="section.title.level1.properties"> + <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master * 1.6"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> +</xsl:attribute-set> +<xsl:attribute-set name="section.title.level2.properties"> + <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master * 1.4"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> +</xsl:attribute-set> +<xsl:attribute-set name="section.title.level3.properties"> + <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master * 1.3"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> +</xsl:attribute-set> +<xsl:attribute-set name="section.title.level4.properties"> + <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master * 1.2"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> +</xsl:attribute-set> +<xsl:attribute-set name="section.title.level5.properties"> + <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master * 1.1"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> +</xsl:attribute-set> +<xsl:attribute-set name="section.title.level6.properties"> + <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> +</xsl:attribute-set> + +<xsl:attribute-set name="section.title.properties"> + <xsl:attribute name="font-family"> + <xsl:value-of select="$title.font.family"/> + </xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> +  + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> + <xsl:attribute name="space-before.optimum">1.0em</xsl:attribute> + <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute> + <xsl:attribute name="text-align">left</xsl:attribute> + <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute> +</xsl:attribute-set> + +<xsl:param name="titlepage.color" select="$title.color"/> + +<xsl:attribute-set name="book.titlepage.recto.style"> + <xsl:attribute name="font-family"> + <xsl:value-of select="$title.fontset"/> + </xsl:attribute> + <xsl:attribute name="color"><xsl:value-of select="$titlepage.color"/></xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="font-size">12pt</xsl:attribute> + <xsl:attribute name="text-align">center</xsl:attribute> +</xsl:attribute-set> + +<xsl:attribute-set name="component.title.properties"> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> + <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> + <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> + <xsl:attribute name="hyphenate">false</xsl:attribute> + <xsl:attribute name="color"> + <xsl:choose> + <xsl:when test="not(parent::chapter | parent::article | parent::appendix)"><xsl:value-of select="$title.color"/></xsl:when> + </xsl:choose> + </xsl:attribute> + <xsl:attribute name="text-align"> + <xsl:choose> + <xsl:when test="((parent::article | parent::articleinfo) and not(ancestor::book) and not(self::bibliography)) or (parent::slides | parent::slidesinfo)">center</xsl:when> + <xsl:otherwise>left</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute> +</xsl:attribute-set> + +<xsl:param name="chaptertitle.color" select="$title.color" /> + +<xsl:attribute-set name="chapter.titlepage.recto.style"> + <xsl:attribute name="color"><xsl:value-of select="$chaptertitle.color"/></xsl:attribute> + <xsl:attribute name="background-color">white</xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:choose> + <xsl:when test="$l10n.gentext.language = 'ja-JP'"> + <xsl:value-of select="$body.font.master * 1.7"/> + <xsl:text>pt</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>24pt</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="text-align">left</xsl:attribute> +  + <xsl:attribute name="padding-left">1em</xsl:attribute> + <xsl:attribute name="padding-right">1em</xsl:attribute> +</xsl:attribute-set> + +<xsl:attribute-set name="preface.titlepage.recto.style"> + <xsl:attribute name="font-family"> + <xsl:value-of select="$title.fontset"/> + </xsl:attribute> + <xsl:attribute name="color">#4a5d75</xsl:attribute> + <xsl:attribute name="font-size">12pt</xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> +</xsl:attribute-set> + +<xsl:attribute-set name="part.titlepage.recto.style"> + <xsl:attribute name="color"><xsl:value-of select="$title.color"/></xsl:attribute> + <xsl:attribute name="text-align">center</xsl:attribute> +</xsl:attribute-set> + + + +<xsl:template name="table.cell.block.properties"> +  + <xsl:if test="ancestor::thead or ancestor::tfoot"> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="background-color">#4a5d75</xsl:attribute> + <xsl:attribute name="color">white</xsl:attribute> + </xsl:if> +</xsl:template> + + + +<xsl:template name="table.row.properties"> + <xsl:variable name="bgcolor"> + <xsl:call-template name="dbfo-attribute"> + <xsl:with-param name="pis" select="processing-instruction('dbfo')"/> + <xsl:with-param name="attribute" select="'bgcolor'"/> + </xsl:call-template> + </xsl:variable> + <xsl:if test="$bgcolor != ''"> + <xsl:attribute name="background-color"> + <xsl:value-of select="$bgcolor"/> + </xsl:attribute> + </xsl:if> + <xsl:if test="ancestor::thead or ancestor::tfoot"> + <xsl:attribute name="background-color">#4a5d75</xsl:attribute> + </xsl:if> +</xsl:template> + + +<xsl:template match="title" mode="appendix.titlepage.recto.auto.mode"> +<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style"> +<xsl:call-template name="component.title.nomarkup"> +<xsl:with-param name="node" select="ancestor-or-self::appendix[1]"/> +</xsl:call-template> +</fo:block> +</xsl:template> + + +<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode"> +<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style"> +<xsl:value-of select="."/> +</fo:block> +</xsl:template> + + +<xsl:template name="preface.titlepage.recto"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style" margin-left="{$title.margin.left}"> +<xsl:call-template name="component.title.nomarkup"> +<xsl:with-param name="node" select="ancestor-or-self::preface[1]"/> +</xsl:call-template></fo:block> + <xsl:choose> + <xsl:when test="prefaceinfo/subtitle"> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/> + </xsl:when> + <xsl:when test="docinfo/subtitle"> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/> + </xsl:when> + <xsl:when test="info/subtitle"> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/subtitle"/> + </xsl:when> + <xsl:when test="subtitle"> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/> + </xsl:when> + </xsl:choose> + + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/corpauthor"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/authorgroup"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/author"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/othercredit"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/othercredit"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/othercredit"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/releaseinfo"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/copyright"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/legalnotice"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/pubdate"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revision"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revhistory"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/> + <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/abstract"/> +</xsl:template> + + +<xsl:template name="pickfont-sans"> + <xsl:variable name="font"> + <xsl:choose> + <xsl:when test="$l10n.gentext.language = 'ja-JP'"> + <xsl:text>KochiMincho,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ko-KR'"> + <xsl:text>BaekmukBatang,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-CN'"> + <xsl:text>ARPLKaitiMGB,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'bn-IN'"> + <xsl:text>LohitBengali,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ta-IN'"> + <xsl:text>LohitTamil,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'pa-IN'"> + <xsl:text>LohitPunjabi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'hi-IN'"> + <xsl:text>LohitHindi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'gu-IN'"> + <xsl:text>LohitGujarati,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-TW'"> + <xsl:text>ARPLMingti2LBig5,</xsl:text> + </xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:choose> + <xsl:when test="$fop1.extensions != 0"> + <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,sans-serif</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$font"/><xsl:text>sans-serif</xsl:text> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="pickfont-serif"> + <xsl:variable name="font"> + <xsl:choose> + <xsl:when test="$l10n.gentext.language = 'ja-JP'"> + <xsl:text>KochiMincho,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ko-KR'"> + <xsl:text>BaekmukBatang,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-CN'"> + <xsl:text>ARPLKaitiMGB,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'bn-IN'"> + <xsl:text>LohitBengali,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ta-IN'"> + <xsl:text>LohitTamil,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'pa-IN'"> + <xsl:text>LohitPunjabi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'hi-IN'"> + <xsl:text>LohitHindi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'gu-IN'"> + <xsl:text>LohitGujarati,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-TW'"> + <xsl:text>ARPLMingti2LBig5,</xsl:text> + </xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:choose> + <xsl:when test="$fop1.extensions != 0"> + <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,serif</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$font"/><xsl:text>serif</xsl:text> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="pickfont-mono"> + <xsl:variable name="font"> + <xsl:choose> + <xsl:when test="$l10n.gentext.language = 'ja-JP'"> + <xsl:text>KochiMincho,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ko-KR'"> + <xsl:text>BaekmukBatang,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-CN'"> + <xsl:text>ARPLKaitiMGB,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'bn-IN'"> + <xsl:text>LohitBengali,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ta-IN'"> + <xsl:text>LohitTamil,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'pa-IN'"> + <xsl:text>LohitPunjabi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'hi-IN'"> + <xsl:text>LohitHindi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'gu-IN'"> + <xsl:text>LohitGujarati,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-TW'"> + <xsl:text>ARPLMingti2LBig5,</xsl:text> + </xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:choose> + <xsl:when test="$fop1.extensions != 0"> + <xsl:copy-of select="$font"/><xsl:text>DejaVuLGCSans,monospace</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$font"/><xsl:text>monospace</xsl:text> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + + + +<xsl:param name="title.font.family"> + <xsl:call-template name="pickfont-sans"/> +</xsl:param> + +<xsl:param name="body.font.family"> + <xsl:call-template name="pickfont-sans"/> +</xsl:param> + +<xsl:param name="monospace.font.family"> + <xsl:call-template name="pickfont-mono"/> +</xsl:param> + +<xsl:param name="sans.font.family"> + <xsl:call-template name="pickfont-sans"/> +</xsl:param> + + + + + +<xsl:template match="address"> + <xsl:param name="suppress-numbers" select="'0'"/> + + <xsl:variable name="content"> + <xsl:choose> + <xsl:when test="$suppress-numbers = '0' + and @linenumbering = 'numbered' + and $use.extensions != '0' + and $linenumbering.extension != '0'"> + <xsl:call-template name="number.rtf.lines"> + <xsl:with-param name="rtf"> + <xsl:apply-templates/> + </xsl:with-param> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <fo:block wrap-option='no-wrap' + white-space-collapse='false' + white-space-treatment='preserve' + linefeed-treatment="preserve" + text-align="start" + xsl:use-attribute-sets="verbatim.properties"> + <xsl:copy-of select="$content"/> + </fo:block> +</xsl:template> + +<xsl:template name="component.title.nomarkup"> + <xsl:param name="node" select="."/> + + <xsl:variable name="id"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="$node"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="title"> + <xsl:apply-templates select="$node" mode="object.title.markup"> + <xsl:with-param name="allow-anchors" select="1"/> + </xsl:apply-templates> + </xsl:variable> + <xsl:copy-of select="$title"/> +</xsl:template> + + +<xsl:template name="header.content"> + <xsl:param name="pageclass" select="''"/> + <xsl:param name="sequence" select="''"/> + <xsl:param name="position" select="''"/> + <xsl:param name="gentext-key" select="''"/> + <xsl:param name="title-limit" select="'30'"/> + +  +  + <xsl:choose> +  + <xsl:when test="$confidential = 1 and (($sequence='odd' and $position='left') or ($sequence='even' and $position='right'))"> + <fo:inline keep-together.within-line="always" font-weight="bold"> + <xsl:text>RED HAT CONFIDENTIAL</xsl:text> + </fo:inline> + </xsl:when> + <xsl:when test="$sequence = 'blank'"> +  + </xsl:when> +  + <xsl:when test="($sequence='first' and $position='left' and $gentext-key='chapter')"> + <xsl:variable name="text"> + <xsl:call-template name="component.title.nomarkup"/> + </xsl:variable> + <xsl:variable name="chapt"> + <xsl:value-of select="substring-before($text, ' ')"/> + </xsl:variable> + <xsl:variable name="remainder"> + <xsl:value-of select="substring-after($text, ' ')"/> + </xsl:variable> + <xsl:variable name="chapt-num"> + <xsl:value-of select="substring-before($remainder, ' ')"/> + </xsl:variable> + <xsl:variable name="text1"> + <xsl:value-of select="concat($chapt, ' ', $chapt-num)"/> + </xsl:variable> + <fo:inline keep-together.within-line="always" font-weight="bold"> + <xsl:value-of select="$text1"/> + </fo:inline> + </xsl:when> +  + <xsl:when test="($sequence='even' and $position='left')"> +  + <xsl:variable name="text"> + <xsl:call-template name="component.title.nomarkup"/> + </xsl:variable> + <fo:inline keep-together.within-line="always" font-weight="bold"> + <xsl:choose> + <xsl:when test="string-length($text) > '33'"> + <xsl:value-of select="concat(substring($text, 0, $title-limit), '...')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$text"/> + </xsl:otherwise> + </xsl:choose> + </fo:inline> +  + </xsl:when> + <xsl:when test="($sequence='odd' and $position='right')"> +  + <fo:inline keep-together.within-line="always"><fo:retrieve-marker retrieve-class-name="section.head.marker" retrieve-position="first-including-carryover" retrieve-boundary="page-sequence"/></fo:inline> +  + </xsl:when> + <xsl:when test="$position='left'"> +  + <xsl:call-template name="draft.text"/> + </xsl:when> + <xsl:when test="$position='center'"> +  + </xsl:when> + <xsl:when test="$position='right'"> +  + <xsl:call-template name="draft.text"/> + </xsl:when> + <xsl:when test="$sequence = 'first'"> +  + </xsl:when> + <xsl:when test="$sequence = 'blank'"> +  + </xsl:when> + </xsl:choose> +</xsl:template> + + +<xsl:template name="head.sep.rule"> + <xsl:param name="pageclass"/> + <xsl:param name="sequence"/> + <xsl:param name="gentext-key"/> + + <xsl:if test="$header.rule != 0"> + <xsl:attribute name="border-bottom-width">0.5pt</xsl:attribute> + <xsl:attribute name="border-bottom-style">solid</xsl:attribute> + <xsl:attribute name="border-bottom-color">#4a5d75</xsl:attribute> + </xsl:if> +</xsl:template> + + +<xsl:template name="foot.sep.rule"> + <xsl:param name="pageclass"/> + <xsl:param name="sequence"/> + <xsl:param name="gentext-key"/> + + <xsl:if test="$footer.rule != 0"> + <xsl:attribute name="border-top-width">0.5pt</xsl:attribute> + <xsl:attribute name="border-top-style">solid</xsl:attribute> + <xsl:attribute name="border-top-color">#4a5d75</xsl:attribute> + </xsl:if> +</xsl:template> + +<xsl:param name="footnote.font.size"> + <xsl:value-of select="$body.font.master * 0.8"/><xsl:text>pt</xsl:text> +</xsl:param> +<xsl:param name="footnote.number.format" select="'1'"/> +<xsl:param name="footnote.number.symbols" select="''"/> +<xsl:attribute-set name="footnote.mark.properties"> + <xsl:attribute name="font-size">75%</xsl:attribute> + <xsl:attribute name="font-weight">normal</xsl:attribute> + <xsl:attribute name="font-style">normal</xsl:attribute> +</xsl:attribute-set> +<xsl:attribute-set name="footnote.properties"> + <xsl:attribute name="padding-top">48pt</xsl:attribute> + <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"/></xsl:attribute> + <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"/></xsl:attribute> + <xsl:attribute name="font-weight">normal</xsl:attribute> + <xsl:attribute name="font-style">normal</xsl:attribute> + <xsl:attribute name="text-align"><xsl:value-of select="$alignment"/></xsl:attribute> + <xsl:attribute name="start-indent">0pt</xsl:attribute> +</xsl:attribute-set> +<xsl:attribute-set name="footnote.sep.leader.properties"> + <xsl:attribute name="color">black</xsl:attribute> + <xsl:attribute name="leader-pattern">rule</xsl:attribute> + <xsl:attribute name="leader-length">1in</xsl:attribute> +</xsl:attribute-set> + +<xsl:template match="author" mode="tablerow.titlepage.mode"> + <fo:table-row> + <fo:table-cell> + <fo:block> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'Author'"/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:call-template name="person.name"> + <xsl:with-param name="node" select="."/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:apply-templates select="email"/> + </fo:block> + </fo:table-cell> + </fo:table-row> +</xsl:template> + +<xsl:template match="author" mode="titlepage.mode"> + <fo:block> + <xsl:call-template name="person.name"> + <xsl:with-param name="node" select="."/> + </xsl:call-template> + </fo:block> +</xsl:template> + +<xsl:param name="editedby.enabled">0</xsl:param> + +<xsl:template match="editor" mode="tablerow.titlepage.mode"> + <fo:table-row> + <fo:table-cell> + <fo:block> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'Editor'"/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:call-template name="person.name"> + <xsl:with-param name="node" select="."/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:apply-templates select="email"/> + </fo:block> + </fo:table-cell> + </fo:table-row> +</xsl:template> + +<xsl:template match="othercredit" mode="tablerow.titlepage.mode"> + <fo:table-row> + <fo:table-cell> + <fo:block> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'translator'"/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:call-template name="person.name"> + <xsl:with-param name="node" select="."/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:apply-templates select="email"/> + </fo:block> + </fo:table-cell> + </fo:table-row> + </xsl:template> + + + + +<xsl:template match="title" mode="book.titlepage.recto.auto.mode"> +<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="20pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}"> +<xsl:call-template name="division.title"> +<xsl:with-param name="node" select="ancestor-or-self::book[1]"/> +</xsl:call-template> +</fo:block> +</xsl:template> + +<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode"> +<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="34pt" space-before="30pt" font-family="{$title.fontset}"> +<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> +</fo:block> +</xsl:template> + +<xsl:template match="issuenum" mode="book.titlepage.recto.auto.mode"> +<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="16pt" space-before="15.552pt" font-family="{$title.fontset}"> +<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> +</fo:block> +</xsl:template> + +<xsl:template match="author" mode="book.titlepage.recto.auto.mode"> + <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" font-size="14pt" space-before="15.552pt"> + <xsl:call-template name="person.name"> + <xsl:with-param name="node" select="."/> + </xsl:call-template> + </fo:block> +</xsl:template> + +<xsl:template name="book.titlepage.recto"> + <xsl:choose> + <xsl:when test="bookinfo/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/> + </xsl:when> + <xsl:when test="info/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/> + </xsl:when> + <xsl:when test="title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/> + </xsl:when> + </xsl:choose> + + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/issuenum"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/issuenum"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="issuenum"/> + + <xsl:choose> + <xsl:when test="bookinfo/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/> + </xsl:when> + <xsl:when test="info/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/> + </xsl:when> + <xsl:when test="subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/> + </xsl:when> + </xsl:choose> + + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/> + + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/> + + <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/invpartnumber"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/invpartnumber"/> + </fo:block> + <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'isbn'"/> + </xsl:call-template> + <xsl:text>: </xsl:text> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/isbn"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/isbn"/> + </fo:block> + <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" color="black"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'pubdate'"/> + </xsl:call-template> + <xsl:text>: </xsl:text> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/> + </fo:block> +</xsl:template> + +<xsl:template name="book.titlepage.verso"> + <xsl:choose> + <xsl:when test="bookinfo/abstract"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/> + </xsl:when> + <xsl:when test="info/abstract"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/> + </xsl:when> + </xsl:choose> + +</xsl:template> + +<xsl:template name="book.titlepage3.recto"> + <xsl:choose> + <xsl:when test="bookinfo/title"> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/> + </xsl:when> + <xsl:when test="info/title"> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/title"/> + </xsl:when> + <xsl:when test="title"> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="title"/> + </xsl:when> + </xsl:choose> + + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/author"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/author"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/othercredit"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/othercredit"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/copyright"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/copyright"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/publisher"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/publisher"/> +</xsl:template> + +<xsl:template name="book.titlepage.separator"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/> +</xsl:template> + +<xsl:template name="book.titlepage.before.recto"> +</xsl:template> + +<xsl:template name="book.titlepage.before.verso"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/> +</xsl:template> + +<xsl:template name="book.titlepage"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> + <xsl:call-template name="book.titlepage.before.recto"/> + <fo:block><xsl:call-template name="book.titlepage.recto"/></fo:block> + <xsl:call-template name="book.titlepage.separator"/> + <fo:block><xsl:call-template name="book.titlepage.verso"/></fo:block> + <xsl:call-template name="book.titlepage.separator"/> + <fo:block><xsl:call-template name="book.titlepage3.recto"/></fo:block> + <xsl:call-template name="book.titlepage.separator"/> + </fo:block> +</xsl:template> + + + +<xsl:template match="question"> + <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> + + <xsl:variable name="entry.id"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="parent::*"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="deflabel"> + <xsl:choose> + <xsl:when test="ancestor-or-self::*[@defaultlabel]"> + <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()] + /@defaultlabel"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$qanda.defaultlabel"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <fo:list-item id="{$entry.id}" xsl:use-attribute-sets="list.item.spacing"> + <fo:list-item-label end-indent="label-end()"> + <xsl:choose> + <xsl:when test="$deflabel = 'none'"> + <fo:block/> + </xsl:when> + <xsl:otherwise> + <fo:block> + <xsl:apply-templates select="." mode="label.markup"/> + <xsl:if test="$deflabel = 'number' and not(label)"> + <xsl:apply-templates select="." mode="intralabel.punctuation"/> + </xsl:if> + </fo:block> + </xsl:otherwise> + </xsl:choose> + </fo:list-item-label> + <fo:list-item-body start-indent="body-start()"> + <xsl:choose> + <xsl:when test="$deflabel = 'none'"> + <fo:block font-weight="bold"> + <xsl:apply-templates select="*[local-name(.)!='label']"/> + </fo:block> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="*[local-name(.)!='label']"/> + </xsl:otherwise> + </xsl:choose> +  +  + </fo:list-item-body> + </fo:list-item> +</xsl:template> + + +<xsl:template match="answer"> + <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> + <xsl:variable name="entry.id"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="parent::*"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="deflabel"> + <xsl:choose> + <xsl:when test="ancestor-or-self::*[@defaultlabel]"> + <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()] + /@defaultlabel"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$qanda.defaultlabel"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <fo:list-item xsl:use-attribute-sets="list.item.spacing"> + <fo:list-item-label end-indent="label-end()"> + <xsl:choose> + <xsl:when test="$deflabel = 'none'"> + <fo:block/> + </xsl:when> + <xsl:otherwise> + <fo:block> + <xsl:variable name="answer.label"> + <xsl:apply-templates select="." mode="label.markup"/> + </xsl:variable> + <xsl:copy-of select="$answer.label"/> + </fo:block> + </xsl:otherwise> + </xsl:choose> + </fo:list-item-label> + <fo:list-item-body start-indent="body-start()"> + <xsl:apply-templates select="*[local-name(.)!='label']"/> + </fo:list-item-body> + </fo:list-item> +</xsl:template> + +<xsl:param name="programlisting.font" select="'verdana,helvetica,sans-serif'" /> +<xsl:param name="programlisting.font.size" select="'100%'" /> + +</xsl:stylesheet> Property changes on: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/main-pdf.xsl ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl =================================================================== --- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl 2008-03-26 18:59:29 UTC (rev 7715) +++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl 2008-03-26 20:48:12 UTC (rev 7716) @@ -1,116 +0,0 @@ -<?xml version='1.0'?> - - - -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:exsl="http://exslt.org/common" - version="1.0" - exclude-result-prefixes="exsl"> - - <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/docbook.xsl"/> - - <xsl:include href="redhat.xsl"/> - <xsl:include href="xhtml-common.xsl"/> - <xsl:include href="highlight.xsl"/> - <xsl:param name="confidential" select="0"/> - - -<xsl:param name="ignore.image.scaling" select="1"/> - - -<xsl:output method="xml" - encoding="UTF-8" - indent="yes" - doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" - doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" - standalone="no"/> - - -<xsl:template name="book.titlepage.recto"> - - <xsl:attribute name="id"> - <xsl:text>title</xsl:text> - </xsl:attribute> - <a> - <xsl:attribute name="href"> - <xsl:text>http://www.jboss.org</xsl:text> - </xsl:attribute> - <xsl:attribute name="class"> - <xsl:text>jbossOrg_href</xsl:text> - </xsl:attribute> - - JBoss.org - - </a> - <a> - <xsl:attribute name="href"> - <xsl:text>http://labs.jboss.com/projects/docs</xsl:text> - </xsl:attribute> - <xsl:attribute name="class"> - <xsl:text>commDoc_href</xsl:text> - </xsl:attribute> - - Community Documentation - - </a> - - <xsl:choose> - <xsl:when test="bookinfo/title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/> - </xsl:when> - <xsl:when test="info/title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/> - </xsl:when> - <xsl:when test="title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="bookinfo/subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/> - </xsl:when> - <xsl:when test="info/subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/> - </xsl:when> - <xsl:when test="subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/> -</xsl:template> - -</xsl:stylesheet> Added: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl =================================================================== --- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl (rev 0) +++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl 2008-03-26 20:48:12 UTC (rev 7716) @@ -0,0 +1,119 @@ +<?xml version='1.0'?> + + + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:exsl="http://exslt.org/common" + version="1.0" + exclude-result-prefixes="exsl"> + + <xsl:import href="http://docbook.sourceforge.net/release/xsl/1.72.0/xhtml/docbook.xsl"/> + + <xsl:include href="redhat.xsl"/> + <xsl:include href="xhtml-common.xsl"/> + <xsl:include href="highlight.xsl"/> + <xsl:param name="confidential" select="0"/> + + <xsl:param name="jbossOrgHref" select="'http://www.jboss.org'" /> + <xsl:param name="commDocHref" select="'http://labs.jboss.com/projects/docs'" /> + + +<xsl:param name="ignore.image.scaling" select="1"/> + + +<xsl:output method="xml" + encoding="UTF-8" + indent="yes" + doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" + doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" + standalone="no"/> + + +<xsl:template name="book.titlepage.recto"> + + <xsl:attribute name="id"> + <xsl:text>title</xsl:text> + </xsl:attribute> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$jbossOrgHref" /> + </xsl:attribute> + <xsl:attribute name="class"> + <xsl:text>jbossOrg_href</xsl:text> + </xsl:attribute> + + JBoss.org + + </a> + <a> + <xsl:attribute name="href"> + <xsl:value-of select="$commDocHref" /> + </xsl:attribute> + <xsl:attribute name="class"> + <xsl:text>commDoc_href</xsl:text> + </xsl:attribute> + + Community Documentation + + </a> + + <xsl:choose> + <xsl:when test="bookinfo/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/> + </xsl:when> + <xsl:when test="info/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/> + </xsl:when> + <xsl:when test="title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/> + </xsl:when> + </xsl:choose> + + <xsl:choose> + <xsl:when test="bookinfo/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/> + </xsl:when> + <xsl:when test="info/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/> + </xsl:when> + <xsl:when test="subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/> + </xsl:when> + </xsl:choose> + + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/> +</xsl:template> + +</xsl:stylesheet> Modified: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-html.xsl =================================================================== --- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-html.xsl 2008-03-26 18:59:29 UTC (rev 7715) +++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-html.xsl 2008-03-26 20:48:12 UTC (rev 7716) @@ -17,83 +17,8 @@ <xsl:import href="common-xhtml.xsl" /> <xsl:param name="html.stylesheet" select="'css/seamframework.css'" /> + + <xsl:param name="jbossOrgHref" select="'http://www.seamframework.org'" /> + <xsl:param name="commDocHref" select="'http://www.seamframework.org/Documentation'" /> -  - <xsl:template name="header.navigation"> - <xsl:param name="prev" select="/foo" /> - <xsl:param name="next" select="/foo" /> - <xsl:param name="nav.context" /> - <xsl:variable name="home" select="/*[1]" /> - <xsl:variable name="up" select="parent::*" /> - <xsl:variable name="row1" select="$navig.showtitles != 0" /> - <xsl:variable name="row2" - select="count($prev) > 0 or (count($up) > 0 and generate-id($up) != generate-id($home) and $navig.showtitles != 0) or count($next) > 0" /> - <xsl:if - test="$suppress.navigation = '0' and $suppress.header.navigation = '0'"> - <xsl:if test="$row1 or $row2"> - <xsl:if test="$row1"> - - <xsl:attribute name="id"> - <xsl:text>title</xsl:text> - </xsl:attribute> - <a> - <xsl:attribute name="href"> - <xsl:text>http://www.seamframework.org</xsl:text> - </xsl:attribute> - <xsl:attribute name="class"> - <xsl:text>seamFrameworkOrg_href</xsl:text> - </xsl:attribute> - SeamFramework.org - </a> - - </xsl:if> - <xsl:if test="$row2"> - <ul class="docnav" xmlns="http://www.w3.org/1999/xhtml"> - <li class="previous"> - <xsl:if test="count($prev)>0"> - <a accesskey="p"> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$prev" /> - </xsl:call-template> - </xsl:attribute> - - <xsl:call-template name="navig.content"> - <xsl:with-param name="direction" - select="'prev'" /> - </xsl:call-template> - - </a> - </xsl:if> - </li> - <li class="next"> - <xsl:if test="count($next)>0"> - <a accesskey="n"> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$next" /> - </xsl:call-template> - </xsl:attribute> - - <xsl:call-template name="navig.content"> - <xsl:with-param name="direction" - select="'next'" /> - </xsl:call-template> - - </a> - </xsl:if> - </li> - </ul> - </xsl:if> - </xsl:if> - <xsl:if test="$header.rule != 0"> - <hr /> - </xsl:if> - </xsl:if> - </xsl:template> - - - </xsl:stylesheet> Modified: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl =================================================================== --- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl 2008-03-26 18:59:29 UTC (rev 7715) +++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/main-pdf.xsl 2008-03-26 20:48:12 UTC (rev 7716) @@ -70,7 +70,7 @@ </fo:inline> </xsl:template> - +  <xsl:attribute-set name="formal.object.properties"> <xsl:attribute name="keep-together.within-column">auto</xsl:attribute> @@ -160,17 +160,19 @@ <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/publisher" /> </xsl:template> - +  <xsl:param name="title.color">#576C74</xsl:param> + <xsl:param name="titlepage.color">#885324</xsl:param> + <xsl:param name="chaptertitle.color">#BA5624</xsl:param>  <xsl:param name="programlisting.font" select="$monospace.font.family" /> - +  <xsl:param name="programlisting.font.size" select="'75%'" /> - +  <xsl:param name="graphicsize.extension" select="'1'" /> Modified: maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/nochunk-html.xsl =================================================================== --- maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/nochunk-html.xsl 2008-03-26 18:59:29 UTC (rev 7715) +++ maven-plugins/trunk/seam-docbook-xslt/src/main/resources/xslt/org/jboss/seam/nochunk-html.xsl 2008-03-26 20:48:12 UTC (rev 7716) @@ -18,75 +18,6 @@ <xsl:import href="common-xhtml.xsl" /> <xsl:param name="html.stylesheet" select="'css/seamframework-nochunk.css'" /> - -  -<xsl:template name="book.titlepage.recto"> - - <xsl:attribute name="id"> - <xsl:text>title</xsl:text> - </xsl:attribute> - <a> - <xsl:attribute name="href"> - <xsl:text>http://www.seamframework.org</xsl:text> - </xsl:attribute> - <xsl:attribute name="class"> - <xsl:text>seamFrameworkOrg_href</xsl:text> - </xsl:attribute> - - SeamFramework.org - - </a> - - <xsl:choose> - <xsl:when test="bookinfo/title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/> - </xsl:when> - <xsl:when test="info/title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/> - </xsl:when> - <xsl:when test="title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="bookinfo/subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/> - </xsl:when> - <xsl:when test="info/subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/> - </xsl:when> - <xsl:when test="subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/> -</xsl:template> - + <xsl:param name="jbossOrgHref" select="'http://www.seamframework.org'" /> + <xsl:param name="commDocHref" select="'http://www.seamframework.org/Documentation'" /> </xsl:stylesheet> Modified: maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-nochunk.css =================================================================== --- maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-nochunk.css 2008-03-26 18:59:29 UTC (rev 7715) +++ maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework-nochunk.css 2008-03-26 20:48:12 UTC (rev 7716) @@ -1,7 +1,5 @@ @IMPORT url("seamframework.css"); -#title { - margin-top: -15px; - margin-left: -15px; - magin-bottom: 30px; +.title { + margin-top: 30px; } \ No newline at end of file Modified: maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css =================================================================== --- maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-03-26 18:59:29 UTC (rev 7715) +++ maven-plugins/trunk/seam-jdocbook-style/src/main/css/css/seamframework.css 2008-03-26 20:48:12 UTC (rev 7716) @@ -7,27 +7,10 @@ font-family: monospace; } -/* - Switch to sfwk fonts, set a page width, set the grey background - */ body { font-family: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; - font-size: 12px; - background-color: #e9e8e7; - max-width: 960px; - background-image: none; } -/* - Replace the banner - */ -#title a.seamFrameworkOrg_href { - display: block; - height: 98px; - width: 960px; - background: url(../images/hrd_bkgimage_fade.gif) top left no-repeat; -} - /* More sfwk styling */ a { @@ -35,158 +18,52 @@ } h1 { - font-size: 150%; + color: #885324; } -/* - Use sfwk colour for title -*/ -h1,h2,h3,h4,h5,h6 { - color: #576C74; +h2 { + color: #BA5624; } /* - The book title, remove the background image + Use sfwk colour for title */ -.title { +h3,h4,h5,h6 { color: #576C74; - background-image: none; - font-size: 175% } -/* - White page - */ -.book { - background-color: white; - padding-top: 10px; - padding-bottom: 10px; - padding-left: 15px; - padding-right: 25px; +div.note { + background: #849092; + color: white; } -/* - White page - */ -.preface { - background-color: white; - padding-top: 10px; - padding-bottom: 10px; - padding-left: 15px; - padding-right: 25px; +div.note h2 { + color: white; } -/* - White page - */ -.chapter { - background-color: white; - padding-top: 10px; - padding-bottom: 10px; - padding-left: 15px; - padding-right: 25px; +div.note a:visited , div.tip a:visited , div.important a:visited , + div.caution a:visited + , div.warning a:visited , div.note a:link , div.tip a:link , + div.important a:link + , div.caution a:link , div.warning a:link { + color: #f7f2d0; } -/* - Change to sfwk navigation icons - */ -.docnav { - margin-bottom: 0px; - border-top: none; +#title a.jbossOrg_href { + display: block; + height: 100px; + width: 362px; + float: left; + background: url(../images/seamlogo.png) top left no-repeat; } -.docnav li.next a strong { - background: url(../images/page.next.gif) top right no-repeat; - padding-top: 0px; - padding-bottom: 0px; - height: 11px; - height: 11px; - padding-right: 30px; - font-size: 1em; +#title a.commDoc_href { + display: block; + height: 100px; + background: transparent url(../images/support_doc.png) top right + no-repeat; } -.docnav li.previous a strong { - background: url(../images/page.previous.gif) top left no-repeat; - padding-top: 0px; - padding-bottom: 0px; - height: 11px; - height: 11px; - padding-left: 30px; - font-size: 1em; -} - -.docnav li.home a strong { - background: none; - padding-top: 0px; - padding-bottom: 0px; - height: auto; - padding-left: 00px; - font-size: 1em; -} - -.docnav li.up a strong { - background: none; - padding-top: 0px; - padding-bottom: 0px; - height: auto; - padding-left: 00px; - font-size: 1em; -} - -.navheader td.next a { - background: url(../images/page.next.png) top right no-repeat; - padding-top: 0px; - padding-bottom: 0px; - height: 11px; - height: 11px; - padding-right: 30px; - font-size: 0.9em; - font-size: 0.9em; -} - -.navheader td.previous a { - background: url(../images/page.previous.png) top left no-repeat; - padding-top: 0px; - padding-bottom: 0px; - height: 11; -} - -.navfooter li.next a strong { - background: url(../images/page.next.gif) top right no-repeat; - padding-top: 0px; - padding-bottom: 0px; - height: 11px; - padding-right: 30px; - font-size: 1em; -} - -.navfooter li.previous a strong { - background: url(../images/page.previous.gif) top left no-repeat; - padding-top: 0px; - padding-bottom: 0px; - height: 11px; - padding-left: 30px; - font-size: 1em; -} - -.navfooter li.home a strong { - background: none; - padding-top: 10px; - padding-bottom: 0px; - height: auto; - padding-left: 30px; - font-size: 1em; -} - -.navfooter li.up a strong { - background: none; - padding-top: 10px; - padding-bottom: 0px; - height: auto; - padding-left: 30px; - font-size: 1em; -} - /* Use sfwk colour as background for examples */ @@ -215,7 +92,7 @@ Make the seam version info into a title */ .releaseinfo { - color: #576C74; + color: #BA5624; font-size: 150%; } @@ -235,13 +112,13 @@ use sfwk.org tables */ .table-contents th { - background:#EDE8DB url(../images/th.bg.gif) repeat-x scroll 0pt; + background: #EDE8DB url(../images/th.bg.gif) repeat-x scroll 0pt; color: black; - font-weight:bold; - padding:2px 5px; - white-space:nowrap; + font-weight: bold; + padding: 2px 5px; + white-space: nowrap; } .table-contents th td { - border-right:1px solid #D3D2D1; + border-right: 1px solid #D3D2D1; } \ No newline at end of file Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/bkg_gradient.gif =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/bkg_gradient.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/caution.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/caution.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/dot.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/dot.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/dot2.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/dot2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/hrd_bkgimage_fade.gif =================================================================== (Binary files differ) Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/important.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/important.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/note.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/note.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/red-bg.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/red-bg.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamlogo.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/seamlogo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-go-back.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-go-back.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-go-forward.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-go-forward.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-go-up.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-go-up.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-home.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/stock-home.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/support_doc.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/support_doc.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/tip.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/tip.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/title_hdr.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/title_hdr.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/warning.png =================================================================== (Binary files differ) Property changes on: maven-plugins/trunk/seam-jdocbook-style/src/main/images/images/warning.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 9 months

1
0
0 / 0

Seam SVN: r7715 - branches/Seam_2_0/src/main/org/jboss/seam/framework.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2008-03-26 14:59:29 -0400 (Wed, 26 Mar 2008) New Revision: 7715 Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java Log: JBSEAM-2747 Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java =================================================================== --- branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java 2008-03-26 18:56:38 UTC (rev 7714) +++ branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java 2008-03-26 18:59:29 UTC (rev 7715) @@ -44,8 +44,8 @@ @Transactional public boolean isNextExists() { - return resultList!=null && - resultList.size() > getMaxResults(); + return resultList!=null && getMaxResults()!=null && + resultList.size() > getMaxResults(); } Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java =================================================================== --- branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-03-26 18:56:38 UTC (rev 7714) +++ branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-03-26 18:59:29 UTC (rev 7715) @@ -58,8 +58,8 @@ @Transactional public boolean isNextExists() { - return resultList!=null && - resultList.size() > getMaxResults(); + return resultList!=null && getMaxResults()!=null && + resultList.size() > getMaxResults(); } @Transactional

16 years, 9 months

1
0
0 / 0

Seam SVN: r7714 - trunk/src/main/org/jboss/seam/framework.

by seam-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2008-03-26 14:56:38 -0400 (Wed, 26 Mar 2008) New Revision: 7714 Modified: trunk/src/main/org/jboss/seam/framework/EntityQuery.java trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java Log: JBSEAM-2747 Modified: trunk/src/main/org/jboss/seam/framework/EntityQuery.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/EntityQuery.java 2008-03-26 18:16:22 UTC (rev 7713) +++ trunk/src/main/org/jboss/seam/framework/EntityQuery.java 2008-03-26 18:56:38 UTC (rev 7714) @@ -44,8 +44,8 @@ @Transactional public boolean isNextExists() { - return resultList!=null && - resultList.size() > getMaxResults(); + return resultList!=null && getMaxResults()!=null && + resultList.size() > getMaxResults(); } Modified: trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-03-26 18:16:22 UTC (rev 7713) +++ trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-03-26 18:56:38 UTC (rev 7714) @@ -58,7 +58,7 @@ @Transactional public boolean isNextExists() { - return resultList!=null && + return resultList!=null && getMaxResults()!=null && resultList.size() > getMaxResults(); }

16 years, 9 months

1
0
0 / 0

Seam SVN: r7713 - trunk/bootstrap/conf and 1 other directory.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-26 14:16:22 -0400 (Wed, 26 Mar 2008) New Revision: 7713 Modified: branches/Seam_2_0/bootstrap/conf/bootstrap-beans.xml trunk/bootstrap/conf/bootstrap-beans.xml Log: JBSEAM-2781, thanks to Clint Popetz Modified: branches/Seam_2_0/bootstrap/conf/bootstrap-beans.xml =================================================================== --- branches/Seam_2_0/bootstrap/conf/bootstrap-beans.xml 2008-03-26 18:01:34 UTC (rev 7712) +++ branches/Seam_2_0/bootstrap/conf/bootstrap-beans.xml 2008-03-26 18:16:22 UTC (rev 7713) @@ -10,7 +10,7 @@ <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry> <key>jboss.bind.address</key> - <value>0.0.0.0</value> + <value>127.0.0.1</value> </entry> <entry> <key>com.arjuna.ats.arjuna.common.propertiesFile</key> Modified: trunk/bootstrap/conf/bootstrap-beans.xml =================================================================== --- trunk/bootstrap/conf/bootstrap-beans.xml 2008-03-26 18:01:34 UTC (rev 7712) +++ trunk/bootstrap/conf/bootstrap-beans.xml 2008-03-26 18:16:22 UTC (rev 7713) @@ -10,7 +10,7 @@ <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry> <key>jboss.bind.address</key> - <value>0.0.0.0</value> + <value>127.0.0.1</value> </entry> <entry> <key>com.arjuna.ats.arjuna.common.propertiesFile</key>

16 years, 9 months

1
0
0 / 0

Seam SVN: r7712 - trunk/src/main/org/jboss/seam/deployment.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-26 14:01:34 -0400 (Wed, 26 Mar 2008) New Revision: 7712 Added: trunk/src/main/org/jboss/seam/deployment/ComponentsXmlDeploymentHandler.java Modified: trunk/src/main/org/jboss/seam/deployment/ComponentDeploymentHandler.java trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java Log: Split components.xml deployment out into another handler Modified: trunk/src/main/org/jboss/seam/deployment/ComponentDeploymentHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/ComponentDeploymentHandler.java 2008-03-26 17:51:39 UTC (rev 7711) +++ trunk/src/main/org/jboss/seam/deployment/ComponentDeploymentHandler.java 2008-03-26 18:01:34 UTC (rev 7712) @@ -13,10 +13,9 @@ import org.jboss.seam.log.Logging; /** - * The {@link ComponentDeploymentHandler} process Seam components, both - * annotated with {@link org.jboss.seam.annotations.Name} and specified in - * components.xml - * + * The {@link ComponentDeploymentHandler} process Seam's component annotated + * with {@link org.jboss.seam.annotations.Name} + * * @author Pete Muir * */ @@ -30,13 +29,10 @@ private static final LogProvider log = Logging.getLogProvider(ComponentDeploymentHandler.class); protected Set<Class<Object>> classes; - - private Set<String> resources; public ComponentDeploymentHandler() { classes = new HashSet<Class<Object>>(); - resources = new HashSet<String>(); } /** @@ -46,14 +42,6 @@ { return Collections.unmodifiableSet(classes); } - - /** - * Get paths to components.xml files - */ - public Set<String> getResources() - { - return Collections.unmodifiableSet(resources); - } /** * @see DeploymentHandler#handle(String, ClassLoader) @@ -74,7 +62,6 @@ log.trace("found component class: " + name); classes.add( (Class<Object>) classLoader.loadClass(classname) ); } - } catch (ClassNotFoundException cnfe) { @@ -88,16 +75,7 @@ { log.debug("could not load classfile: " + classname, ioe); } - } - else if (name.endsWith(".component.xml") || name.endsWith("/components.xml")) - { - // we want to skip over known meta-directories since Seam will auto-load these without a scan - if (!name.startsWith("WEB-INF/") && !name.startsWith("META-INF/")) - { - resources.add(name); - } - } - + } } private static String componentFilename(String name) Added: trunk/src/main/org/jboss/seam/deployment/ComponentsXmlDeploymentHandler.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/ComponentsXmlDeploymentHandler.java (rev 0) +++ trunk/src/main/org/jboss/seam/deployment/ComponentsXmlDeploymentHandler.java 2008-03-26 18:01:34 UTC (rev 7712) @@ -0,0 +1,56 @@ +package org.jboss.seam.deployment; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +/** + * The {@link ComponentsXmlDeploymentHandler} components.xml and .component.xml files + * + * @author Pete Muir + * + */ +public class ComponentsXmlDeploymentHandler extends AbstractDeploymentHandler +{ + /** + * Name under which this {@link DeploymentHandler} is registered + */ + public static final String NAME = "org.jboss.seam.deployment.ComponentsXmlDeploymentHandler"; + + private Set<String> resources; + + public ComponentsXmlDeploymentHandler() + { + resources = new HashSet<String>(); + } + + /** + * Get paths to components.xml files + */ + public Set<String> getResources() + { + return Collections.unmodifiableSet(resources); + } + + /** + * @see DeploymentHandler#handle(String, ClassLoader) + */ + public void handle(String name, ClassLoader classLoader) + { + if (name.endsWith(".component.xml") || name.endsWith("/components.xml")) + { + // we want to skip over known meta-directories since Seam will auto-load these without a scan + if (!name.startsWith("WEB-INF/") && !name.startsWith("META-INF/")) + { + resources.add(name); + } + } + + } + + public String getName() + { + return NAME; + } + +} Property changes on: trunk/src/main/org/jboss/seam/deployment/ComponentsXmlDeploymentHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java =================================================================== --- trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java 2008-03-26 17:51:39 UTC (rev 7711) +++ trunk/src/main/org/jboss/seam/deployment/StandardDeploymentStrategy.java 2008-03-26 18:01:34 UTC (rev 7712) @@ -37,6 +37,7 @@ public static final String HANDLERS_KEY = "org.jboss.seam.deployment.deploymentHandlers"; private ComponentDeploymentHandler componentDeploymentHandler; + private ComponentsXmlDeploymentHandler componentsXmlDeploymentHandler; private NamespaceDeploymentHandler namespaceDeploymentHandler; private AnnotationDeploymentHandler annotationDeploymentHandler; @@ -48,6 +49,8 @@ this.classLoader = Thread.currentThread().getContextClassLoader(); componentDeploymentHandler = new ComponentDeploymentHandler(); getDeploymentHandlers().put(ComponentDeploymentHandler.NAME, componentDeploymentHandler); + componentsXmlDeploymentHandler = new ComponentsXmlDeploymentHandler(); + getDeploymentHandlers().put(ComponentsXmlDeploymentHandler.NAME, componentsXmlDeploymentHandler); namespaceDeploymentHandler = new NamespaceDeploymentHandler(); getDeploymentHandlers().put(NamespaceDeploymentHandler.NAME, namespaceDeploymentHandler); annotationDeploymentHandler = new AnnotationDeploymentHandler(getPropertyValues(AnnotationDeploymentHandler.ANNOTATIONS_KEY), classLoader); @@ -79,7 +82,7 @@ */ public Set<String> getScannedComponentResources() { - return componentDeploymentHandler.getResources(); + return componentsXmlDeploymentHandler.getResources(); } /**

16 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits March 2008